Merge branch 'hotfix'
commite6fdf918a4ca6c92eeba767e4c3d9d76c997e103
authorBastien Guerry <bzg@altern.org>
Fri, 6 Apr 2012 08:53:24 +0000 (6 10:53 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 6 Apr 2012 08:53:24 +0000 (6 10:53 +0200)
tree0957db6242a2014457f053bd0157e08a4ed97834
parent51e7e5dc413212a6cc1dab38b8faff96b6af875f
parent35a5f069d8a391f18c61b94cf70a58ee1808413a
Merge branch 'hotfix'