Merge branch 'maint'
commit69615a7147bf3c41bdc526e8f000804ec69b6a92
authorBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 17:09:37 +0000 (29 19:09 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 29 Apr 2013 17:09:37 +0000 (29 19:09 +0200)
tree7da57c2a9248492b654a286ceaa3571d26753f19
parent3f81fe855b881138e9ac5d05817c5f8e4fbd28c6
parent7f84b5fe5e626f04a991a9ff371ffa968a03de48
Merge branch 'maint'