Merge branch 'maint'
commit1734eea184ffbb6cf99391246e97b8595039cb0d
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 4 Oct 2013 19:12:40 +0000 (4 21:12 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 4 Oct 2013 19:12:40 +0000 (4 21:12 +0200)
tree7329b31bfe293d1138edc0214c16e903ea345983
parentee6c792ec7657e50524d78d309538e7e58bb2989
parentb67ff6073c09b3f5c3878152d42efe34fcf0fd6e
Merge branch 'maint'