Merge commit 'upstream/0.2.6'
authorJulien Valroff <julien@kirya.net>
Sat, 17 Apr 2010 10:31:34 +0000 (12:31 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 17 Apr 2010 10:31:34 +0000 (12:31 +0200)
commit576a2708e9dc705960bb12482c95c1cef58d3dd4
tree3286a91dc3ca1289811ce97357ee38e4d3944877
parent4dfbbc30c71f6aecbedeee77de1c3151e1e7618a
parentaaf7e85febcf2f5a7578f58657ba5970eb0a1643
Merge commit 'upstream/0.2.6'