Merge branch 'maint'
commita4ee1466e96ced73265f77890b4372fdad7daf8c
authorBastien Guerry <bzg@altern.org>
Sun, 30 Sep 2012 06:47:26 +0000 (30 08:47 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 30 Sep 2012 06:47:26 +0000 (30 08:47 +0200)
treef01277f03fbf58dff009c439eacb28646882f807
parent4bb8819bfcca32815cd9e94437334b1fd1dda36b
parentcde9275e513215d16e6e03e64392897630bdcd27
Merge branch 'maint'