Merge branch 'maint-fixes' into maint
commitf4a2680f4c4007e99f799a280d46dfae52e90f7f
authorBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:14:42 +0000 (24 01:14 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 00:14:42 +0000 (24 01:14 +0100)
treeca11fa2e266ddcb6f370d70c937b15fd68815614
parent73d506a8dc01819fd0cf0a110788d8e8ae55ef36
parent317a96a4714e648652045b3fddca004fddeb890f
Merge branch 'maint-fixes' into maint