Merge branch 'maint'
commit6db74e8d5c7ddb310185dfba6c13ed825b702fb5
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 2 Aug 2013 23:52:27 +0000 (3 01:52 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 2 Aug 2013 23:52:27 +0000 (3 01:52 +0200)
tree429005203b45ff559080cb7c98fe93f72538e036
parenta3375f3432677ed091a90fbdf33a7747ab1a8e2d
parent216521ea2ba54106d0dc6a29248d5691deca5dcd
Merge branch 'maint'