Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:40:24 +0000 (04:40 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:40:24 +0000 (04:40 +0100)
commit3d8d47d7858ae0e043a28f348fe8aec444d0d35a
treed82045e31bc409a1c14d74d13c65a051ec95922c
parent0d8cbfc5e0c1c1408d2d48707fefbd60c12b78a6
parent8c47f16dccd8a4dd91f365233690bd8139431249
Merge commit 'upstream/master' into prv/po