Merge branch 'maint'
commit4bb8819bfcca32815cd9e94437334b1fd1dda36b
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:47:38 +0000 (29 23:47 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:47:38 +0000 (29 23:47 +0200)
tree550ff7ad47edc97e01d9786c2e6967502159db81
parent50caf9742231d5b5bba95caa199fca32cdbefe65
parentf60955a21a2aa55f760fb2c81d5e338c01ef3cec
Merge branch 'maint'