Merge branch 'maint'
commitd5352292054e254347e0f324e9e8301bad499242
authorBastien Guerry <bzg@altern.org>
Fri, 7 Feb 2014 08:25:04 +0000 (7 09:25 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 7 Feb 2014 08:25:04 +0000 (7 09:25 +0100)
tree168c5f18f65efe54007460b049880281f727b7ee
parente583eaa8f11fdbe2d122b6a272eae5db768a6169
parentff41c56d115535f5a61e50d50614aed3c6359238
Merge branch 'maint'