Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 12 Jul 2013 13:12:01 +0000 (15:12 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 12 Jul 2013 13:12:01 +0000 (15:12 +0200)
commit0c233ae4e961d005aff02106242368b6f08b32ea
tree59f35a1180288bb543022461ecf4047f9b43b1e8
parent44082746da6de2ee13a4e2043e1478d7d26bd7fe
parent7fcf4995afe87deae583c5e23c6318b36b139d25
Merge branch 'maint'