Merge branch 'maint'
commit51893a4e3d6c53011297cd1f3dcc2ff0f0dfdcce
authorBastien Guerry <bzg@altern.org>
Tue, 29 Apr 2014 11:46:49 +0000 (29 13:46 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 29 Apr 2014 11:46:49 +0000 (29 13:46 +0200)
tree2ef6906ecdd6ac66b42d71f9b73821783c3c7ca6
parenta44cd724c3342aa6e32bf584ffd2864ad5988d7c
parentb0f862dfa9f315d17e87fd2ff9e96e63551be46f
Merge branch 'maint'