Merge branch 'maint'
commit9b8b72c2699ae2dd74d80322a402d7251290bc55
authorBastien Guerry <bzg@altern.org>
Mon, 27 Aug 2012 19:24:38 +0000 (27 21:24 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 27 Aug 2012 19:24:38 +0000 (27 21:24 +0200)
treedc09d7488abbe6f1c16cdef632ff32a0ed3705ab
parent82e1c4b3ec5db48ddf0d7f3e2711de65f95a26b5
parent55909726488b75abae92adb9b6f38d278eca71fa
Merge branch 'maint'