Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 08:51:02 +0000 (09:51 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 08:51:02 +0000 (09:51 +0100)
commit6e31cf5a1eeec3a97a053ec68c4f7a95e63c014c
treeac06b4dd1390d905459d3719833207256af4fea2
parentfb143b6787d6206d0927b30c6610cee2e5c2933a
parent209afadbf9f56041beeaa959f47db4fa584b132e
Merge branch 'maint'