Merge branch 'maint'
commita87cecc8c4e1e0e970f485fd12b400c0ac61b7df
authorBastien Guerry <bzg@gnu.org>
Tue, 3 Jan 2012 08:41:17 +0000 (3 08:41 +0000)
committerBastien Guerry <bzg@gnu.org>
Tue, 3 Jan 2012 08:41:17 +0000 (3 08:41 +0000)
tree23e26dbf97c56240d06213249719735055e06f89
parent8d7aa7dfa87433077d40e2dcab982fb537621e66
parent2b3534a81f6f4c925f55ed7aaec31ead6f400577
Merge branch 'maint'