Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 12 Sep 2013 14:51:16 +0000 (16:51 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 12 Sep 2013 14:51:16 +0000 (16:51 +0200)
commitdf047521faed900aa422d05b039fa7270cfe50b0
treee79c4aea877f7ed83035adeab215240f57b3e923
parenta1f9a1514a28accaad6646c7ed79803168774ccd
parent8a11f9c90fc848a33bc742f7303957161e158ed8
Merge branch 'maint'