Merge branch 'maint'
commit64adcc75f57ccb5181226bfdea71cc79a5220f5f
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 24 Feb 2014 16:35:24 +0000 (24 17:35 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 24 Feb 2014 16:35:24 +0000 (24 17:35 +0100)
treeda6df0c36e92a5158b77d120c4bbf98ce9f9734c
parentd55fa4b783ed662cbeba83a4ee5ea68241888cc1
parent2e72176e211604e364f1a3ec8620b83b99e6e50e
Merge branch 'maint'