Merge branch 'maint'
commit4a704a77ffb1399538c9527da592ecf24629517f
authorBastien Guerry <bzg@altern.org>
Thu, 27 Jun 2013 15:37:50 +0000 (27 17:37 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 27 Jun 2013 15:37:50 +0000 (27 17:37 +0200)
tree7f8b8c5a3d3f930f267260be2a0004f8818d9e76
parent370a2bfb4f2530b6a8e3a4f12358810413198081
parentb0059198c31b6454995fef50115636744565230e
Merge branch 'maint'