Merge branch 'maint'
commit3b8f7b42cf15b8b10e5c3ebf79de06b54ce33f8a
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 08:39:09 +0000 (26 10:39 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 08:39:09 +0000 (26 10:39 +0200)
treed2a31fd724d77224d03a94c8e5d4cffc24570c03
parent9dfccd3f2b8be21015827a8dd3e7e4806fad3a20
parent5efd7311e88ca001361136d03fa14e632bd2cac3
Merge branch 'maint'