Merge commit 'upstream/1.0'
authorJulien Valroff <julien@kirya.net>
Mon, 5 Sep 2011 13:44:04 +0000 (15:44 +0200)
committerJulien Valroff <julien@kirya.net>
Mon, 5 Sep 2011 13:44:04 +0000 (15:44 +0200)
commitda77cb137a2a889130be09ead0bc580a2e30e952
tree950fd63c66cb745d0c25040f0980419e323feebf
parent150ee411883e6c1af94d95a33a864a6481c7049a
parent9c9bbd375922802831526503aa9870f06ed1ac59
Merge commit 'upstream/1.0'