Merge branch 'maint'
commitd0e8e576363716f7f5e41e637890ffe28e79f661
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 22 Nov 2013 11:44:15 +0000 (22 12:44 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 22 Nov 2013 11:44:15 +0000 (22 12:44 +0100)
treeda40613f492957980e99e6052801d82ea510aa22
parent5ae3a25755a6283f68e829ebd045ee17a94346a1
parent72a81dd06a816cb98e3ed5eeab178098d1665113
Merge branch 'maint'