Merge branch 'maint'
commit15a72f6256b0c78d18cdcf36b23e03696b1f2642
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 4 May 2013 07:05:49 +0000 (4 09:05 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 4 May 2013 07:05:49 +0000 (4 09:05 +0200)
tree4575ff2ba04a9a8d105e81c0247f1232ccef4383
parent40635b2b4c3e718622a5a006c1addf0a7b3d0009
parent3e1d83bf6b7089c23bbddd613093b186ca7d7dcb
Merge branch 'maint'