Merge branch 'maint'
commitbf304c34854e2f07001e8180508f0c833d17307f
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 17 Jan 2014 11:45:21 +0000 (17 12:45 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 17 Jan 2014 11:45:21 +0000 (17 12:45 +0100)
tree434f88ee0ff1a15ea0ae70b80eb398954220e693
parentbcf61041add4b17607c0f85e9454a43abf2aff98
parent1e25d087dd09822396cf53d28d6d0e49ce988cef
Merge branch 'maint'