Merge branch 'maint'
commit43cc5beca2b90ab3c2e1e66eee5e7bdb361cd7ca
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 25 May 2013 15:08:57 +0000 (25 17:08 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 25 May 2013 15:08:57 +0000 (25 17:08 +0200)
treea446384c40722c9468a1596e17f11a9443d132a8
parentd3eaa6abb6ebbcb9d3a7504cab689c1022655409
parent10169054eb9c4cf8c03f727afdadf13659a7c470
Merge branch 'maint'