Merge branch 'maint'
commit03dfc23505cd8b9de902454fa0857ff3dbaa6cb8
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 15 Jun 2014 07:30:54 +0000 (15 09:30 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 15 Jun 2014 07:30:54 +0000 (15 09:30 +0200)
tree69e7b3917fc12374b5d24a9ad6513fd7d58bfa0b
parent23496c5e4e866b795e5062d89ebb624924347871
parent61e06a038adc302922c338c6a1956bc51d7bf95d
Merge branch 'maint'