Merge commit 'upstream/0.9'
authorJulien Valroff <julien@kirya.net>
Thu, 1 Sep 2011 04:51:36 +0000 (06:51 +0200)
committerJulien Valroff <julien@kirya.net>
Thu, 1 Sep 2011 04:51:36 +0000 (06:51 +0200)
commit9e147854aeb7cc8f40f6395b0cd4514757068b40
treececc21e353e527642aeaa80a99191fe3f0f3faec
parent41bf0b1b0a5e130282a9aec0a09e44557c866afa
parent35db8c054937fa7d9eea82a9f00489d6893edc16
Merge commit 'upstream/0.9'