Merge branch 'maint'
commitec0eab7fc97fa3902de2308dfb01818bdd7db589
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 29 Apr 2014 09:37:39 +0000 (29 11:37 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 29 Apr 2014 09:37:39 +0000 (29 11:37 +0200)
treeb984809e7fcf1e30da931e279eef69ca24bf5537
parent86a129c59799fe820933f7c2f97e100c92b10287
parentea50ad41bee8a813fd7c172574fd3c600c6b34f0
Merge branch 'maint'