Merge branch 'hotfix'
commit43be98cfed3c3be08f67f3c61aeeabdd8d1bf70a
authorBastien Guerry <bzg@altern.org>
Wed, 11 Apr 2012 11:02:38 +0000 (11 13:02 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 11 Apr 2012 11:02:38 +0000 (11 13:02 +0200)
tree5aa3e1f56fbf38ba8e5bc91430fae81d4390b3df
parentfe5e004e39633706005512bc40d7d215028b34d0
parentac2cb80ec0d013b8b70f69d085cee8066de3acb4
Merge branch 'hotfix'