Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Wed, 22 Dec 2010 11:54:18 +0000 (12:54 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 22 Dec 2010 11:54:18 +0000 (12:54 +0100)
commita8d733130e99c3b611605d2b3d0db9a9ca8f98f7
tree38ed3efebfa1c1c93afa325e9a57ad7e50f415c0
parent74055be78f46fd4997eee160a092fd7e117b6c45
parentfd6d4fda6a95f8318c33aed66c4fcf05aad72b86
Merge remote branch 'upstream/master' into prv/po