Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:05:03 +0000 (11:05 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:05:03 +0000 (11:05 +0200)
commit474b6524e0fe4b4bb3402bf6551bf97be7f3ee1f
treef303c5391cb168793bdd8d08265d37900eb96330
parent0055354e3cce1d1fb8ea2ac0d5c67a4c16a2b0b0
parent20ecef4d024f751481645db3aa68d098e1251b19
Merge remote branch 'upstream/master' into prv/po
t/po.t