Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:39:15 +0000 (23:39 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:39:15 +0000 (23:39 +0100)
commit4c6c00ccdff71fbb8973de7d256fc987d7a2a7e0
treec27774e2cfadf0fa3976f710941f59fd66ecaae7
parent225e21f6c5da40f3beea27e084515daf83471d95
parent4dc4c9586dbae352c27cd316374fbf0e1db1d082
Merge commit 'upstream/master' into prv/po