Merge branch 'maint'
commitdc116caf10c9a82edfd0e49df63b93623f303635
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Aug 2012 10:14:15 +0000 (27 12:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 27 Aug 2012 10:14:15 +0000 (27 12:14 +0200)
tree495d8b46c653c930140bede2844cf3c010303b5e
parentb37b95724c6a519106adb8b39ce275ffa70938aa
parent857b980515000c6b2f37965085cf313e5723de34
Merge branch 'maint'