Merge commit 'upstream/0.2.7'
authorJulien Valroff <julien@kirya.net>
Sat, 1 May 2010 06:33:47 +0000 (08:33 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 1 May 2010 06:33:47 +0000 (08:33 +0200)
commit7047de08633b5f0cb116b1aa7c24c981f4d715e1
tree6576e2ea231080072a155327a14d96392c72b8f9
parentb1fae71252bf2c5d31b7220afa299cb867507671
parentd6ff85c5c23563ee2f27f48d4f790a9201d3446a
Merge commit 'upstream/0.2.7'