Merge branch 'maint'
commitb5460d5722e0c3cc86a90ce54366d266ee5afd7a
authorBastien Guerry <bzg@altern.org>
Mon, 25 Feb 2013 09:47:47 +0000 (25 10:47 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Feb 2013 09:47:47 +0000 (25 10:47 +0100)
tree7b6867562b97003670c3b6bfb955723ad4e911f3
parent0030e160027be076b2153325f43209b735d4fa0b
parentad06a946a59366c48d832dca1df94cdeba38a920
Merge branch 'maint'