Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:19:24 +0000 (22:19 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:19:24 +0000 (22:19 +0100)
commit339478ba4737d77b5e03a3489c3f1f78b7af147d
tree303db5cd9881f23240f31678e657643c1656f4c1
parenta0ac34607919eab8f25e5312366c9c06bcfb791b
parent32b86c5f5b8eef0fdeb2229159787cc3d9206a74
Merge commit 'upstream/master' into prv/po