Merge branch 'maint'
commit45d81d47ca740853a9a37c135250d4633c1e0cc8
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 4 Oct 2013 19:14:39 +0000 (4 21:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 4 Oct 2013 19:14:39 +0000 (4 21:14 +0200)
treee44814b1de46549ce45dafd59f9f7a2e63a1cd13
parent1734eea184ffbb6cf99391246e97b8595039cb0d
parent35e5e5b8b06cfab35ee59253bfb234b7e53f3e4a
Merge branch 'maint'