Merge branch 'maint'
commit3c5f938ae377e5d704393cfc2b31291d72baadba
authorBastien Guerry <bzg@altern.org>
Fri, 13 Jun 2014 10:05:55 +0000 (13 12:05 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 13 Jun 2014 10:05:55 +0000 (13 12:05 +0200)
treea3b9b5ad9588b5ef7920e8540e0c79d197ec6961
parent7eba1c2f548b1c279444e2cb1e806af7c19f87df
parent3a1e6a3c3aa07a030edcc7a9bb75b4b153c07e59
Merge branch 'maint'