Merge branch 'maint'
commit24aa4ab127a50c45c4688bc5b3b603bb87b6b54f
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 29 Apr 2013 07:40:32 +0000 (29 09:40 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 29 Apr 2013 07:40:32 +0000 (29 09:40 +0200)
tree74ff69343231e8d8208387f149c21d7adafc515f
parent5ca2ea00b2e5814161eab0dac5d08e8d2d2d27bb
parent1ce00aaffddc66e154893aed267fe05f06d56501
Merge branch 'maint'