Merge branch 'maint'
commit09f148ec2ef75421405ca32671d661b10c4a4330
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 7 Jan 2014 20:54:42 +0000 (7 21:54 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 7 Jan 2014 20:54:42 +0000 (7 21:54 +0100)
treee41d16f7c4ae7970bddabf565288610b19ac2431
parentf18b153d7c87e9c2dcd6e2c98871b76507d664cd
parentfc09ad3be42bb859e51ae28485e72da3ff5bc7fa
Merge branch 'maint'