Merge branch 'maint'
commit847637f4bdacb861723438c1389f1a3bcdac48af
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 25 May 2013 20:03:48 +0000 (25 22:03 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 25 May 2013 20:03:48 +0000 (25 22:03 +0200)
treed4512f87b4311db7d1ad9369e0e21e1ee84d6065
parent43cc5beca2b90ab3c2e1e66eee5e7bdb361cd7ca
parent206762bd34bdaf1816897db93b73b3822071aa83
Merge branch 'maint'