Merge branch 'maint'
commitf485539d6365a0711129c28732e72bd75083105b
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 29 Sep 2013 08:30:50 +0000 (29 10:30 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 29 Sep 2013 08:30:50 +0000 (29 10:30 +0200)
treea94fc952820b8e09186208936f054ac2e2949f87
parentcd5cccd6e9e67bc8eb35c936d5eb004e4a3eb830
parentd745cd1952cc76fdcc164e8cb2abccb543ac1201
Merge branch 'maint'