Merge branch 'maint'
commit86737d323e99645dd37134516fec3b813385c409
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 10:54:58 +0000 (8 11:54 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 10:54:58 +0000 (8 11:54 +0100)
tree38a83c94ed3f55353fd03947f354d58d7d69ca4d
parent7a186dc005cf01742718c335e18ad06b421aa3cb
parent0bcb86f4caa570d31035eab7e287ec1e1e81ea47
Merge branch 'maint'