Merge commit 'upstream/0.2.5'
authorJulien Valroff <julien@kirya.net>
Sun, 4 Apr 2010 12:16:33 +0000 (14:16 +0200)
committerJulien Valroff <julien@kirya.net>
Sun, 4 Apr 2010 12:16:33 +0000 (14:16 +0200)
commit1e826cb41d6cee8753ef88e742663fe23d32a71a
treef6305a4986d4631c5d5b4d347f306c1961cb7c3e
parentc92969e7007ab861fca62a7c178d5d8bb43a380b
parent9da333afed9f33e9cd3c04422f1696e276c1dd96
Merge commit 'upstream/0.2.5'