Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 8 Sep 2013 21:53:16 +0000 (23:53 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 8 Sep 2013 21:53:16 +0000 (23:53 +0200)
commitaecdf50dc6efdfbb4c9e34636cc2c3828bf935a6
treed89ed14db4836cc463341e5efa4d2e284a7a1f2a
parent0a8abfba95d65ef7b36508476603349a559ed429
parenta031a4b75baf18975d1b8d4530cbed164bfc9db5
Merge branch 'maint'