Merge branch 'maint'
commit7ef92ae1211504f2bd24fd51fd9f9e4e33ba2431
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 4 Jan 2014 13:29:03 +0000 (4 14:29 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 4 Jan 2014 13:29:03 +0000 (4 14:29 +0100)
treebfee8fc9c987addf4280bff868905193b547436a
parent02078833e0521e301e44813cef60c20d239808a8
parent9b0067e16600eca0d653db2d1c7b4b57bfd5ef74
Merge branch 'maint'