Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 16:24:54 +0000 (18:24 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 11 Sep 2013 16:24:54 +0000 (18:24 +0200)
commita1f9a1514a28accaad6646c7ed79803168774ccd
tree49c2a86157c4881d42112a14219ab17d24ad12ba
parent087e51a5d3cc04323cb83618cf11623136e2b093
parent29c33591a2920d4dbea20e887fa28ed3651877fa
Merge branch 'maint'