Merge branch 'maint'
commit79f75b77c49e6165414205d124afa21e9ce3434e
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 21:20:08 +0000 (26 23:20 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 21:20:08 +0000 (26 23:20 +0200)
tree244803bda6a75162f137865ae0dfad95611d4ef6
parentf285b7ed3d097dd1cbb55fa3c31bc92aa0149054
parent92f3729857ac7577be442d46f663f615d95bcad0
Merge branch 'maint'