Merge commit 'upstream/0.2.85' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 2 Jan 2011 12:46:55 +0000 (13:46 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 2 Jan 2011 12:46:55 +0000 (13:46 +0100)
commit5ae56a29ffdaea1cea258d57a1e78883f55e0cef
tree65110ace2dd7fb96e242dc27b793241f5232a43d
parent2d6de70c2ad22451785494c9e0e9bcbbce326141
parentae132cc17f0fd7b5309ba77396b61efbc25acd8e
Merge commit 'upstream/0.2.85' into experimental