Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:32:41 +0000 (12:32 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:32:41 +0000 (12:32 +0100)
commite7f508c5ac43e7798f7fae0018f6ca530708a98a
tree25b5afaed4713b712f88762e1394439f14a2c5bd
parent1f54c13ec24977988a303f004f3fc08ee2e01abc
parent466ceb13946699cbd6b0ef0cad8f3040804265ae
Merge commit 'upstream/master' into prv/po