Merge branch 'maint'
commit92c9b69b7f6620617e15a9bee0f1b9db4b34ccca
authorBastien Guerry <bzg@altern.org>
Sat, 18 Jan 2014 08:17:33 +0000 (18 09:17 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 18 Jan 2014 08:17:33 +0000 (18 09:17 +0100)
treeddacbb32bea51ade0bfcd5323f3f09f6c522dd5d
parentd74205b0f9e0707642c7b81e1c33a4a059323bea
parent7b2af7cb60746e7b8b91d60d7d6fec208611e61b
Merge branch 'maint'