Merge commit 'upstream/0.2.85' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 2 Jan 2011 12:48:47 +0000 (13:48 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 2 Jan 2011 12:48:47 +0000 (13:48 +0100)
commite0e06814f78c3dd8a05d9c39d92925b9d2d84dbd
treeb674a1c8e569465634c5ff126c9c3d0b3da26811
parentbbfc67b40dcdbf277892a484032e615922abc53b
parentd14fbfa23957c310a9321961b417fe197e2d869f
Merge commit 'upstream/0.2.85' into experimental