Merge commit 'upstream/0.2.85+hg33' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 6 Mar 2011 15:54:29 +0000 (16:54 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 6 Mar 2011 15:54:29 +0000 (16:54 +0100)
commitd9c7ac5a922d07469404f857ba5dd59fc75f04a5
treef48171a93fdcbe2805d1eaef4a9541b0beb0d9ea
parentc78d2d5f868b16f6687f61f8858905edddfce1d0
parentb36a9142869e8350cbea578bbc7e398d99d0134f
Merge commit 'upstream/0.2.85+hg33' into experimental