Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 10:04:47 +0000 (11:04 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 10:04:47 +0000 (11:04 +0100)
commit42df907d483d36f70e74ab340bd8ffa2319182e5
tree5216cdd9e639cb5f8f3739fbf39b53bc5e321fb4
parent7773e0d94cb19f57a762303fe0a0549a52c99f08
parent7133e712426d8468abdbef0599d1e972562e21b2
Merge branch 'maint'