Merge branch 'maint'
commitb0eeb260ef8a6dafab4d548a254e15d8e5e07863
authorBastien Guerry <bzg@altern.org>
Sat, 27 Oct 2012 07:25:18 +0000 (27 09:25 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 27 Oct 2012 07:25:18 +0000 (27 09:25 +0200)
tree7e97a5110c3ab4d99b7f603efd5aaa45eddebc69
parent4c3527d2e647615cbeddebf13de09b289f215c4a
parentb1f20bde27faf226e28ce980da9cca06de9c4a7d
Merge branch 'maint'