Merge branch 'maint'
commit77368d13fa4f0fc1c1ef7dc0382a6042365eab29
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 8 May 2013 14:01:45 +0000 (8 16:01 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 8 May 2013 14:01:45 +0000 (8 16:01 +0200)
treedb3c63cbba1a5cbb167cf0a9e262f47808ffec6a
parent5a14001b5e06c2891a9fd711b25da18ca18d4ab2
parent16f12e0aef9fab4bdc575ebee8c463846377ef8b
Merge branch 'maint'