Merge branch 'maint'
commit800ea286c48692f2438550e7eecbc915c1999dc9
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 8 May 2013 16:20:08 +0000 (8 18:20 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 8 May 2013 16:20:08 +0000 (8 18:20 +0200)
tree5751a63e40c68a0c280480d070700c33b1099d7c
parent77368d13fa4f0fc1c1ef7dc0382a6042365eab29
parent7e4c7edb8a077149c8da7ede0a4e42e7861a32d9
Merge branch 'maint'