Merge branch 'maint'
commit44c5aa7315aad1d4649910d41437aa21831e690a
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 10:23:42 +0000 (11 12:23 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 10:23:42 +0000 (11 12:23 +0200)
tree5d43e1673986eb66ab1b9309713afe68719f63a2
parentaecdf50dc6efdfbb4c9e34636cc2c3828bf935a6
parentaf9c0fbf9143883ce31478a137a60cc69428d4d4
Merge branch 'maint'