Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 8 Mar 2009 23:32:10 +0000 (00:32 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 8 Mar 2009 23:32:10 +0000 (00:32 +0100)
commitf4a1732b0e65ea4459098e4e852dff10a5af9320
tree60b8cf4b1677504cb86f301bb62a33cc769fafd9
parentcc5be82b8b7cfe3b679d8ba4f0d62e0894d9f964
parent0978be7affa6222d91a0bc71ddd1e86f81fc56cd
Merge commit 'upstream/master' into prv/po
debian/copyright