Merge branch 'maint'
commit3f8aee0ed09dc6031346c9b1abbe2b003e0cc53b
authorBastien Guerry <bzg@altern.org>
Fri, 10 Jan 2014 09:30:07 +0000 (10 10:30 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 10 Jan 2014 09:30:07 +0000 (10 10:30 +0100)
treee51993851082b0088acc530ef71d54eb5d21fff2
parent2c782da8019de4eded3b5686fcfffa51abda1585
parentbe63eb69050ce78b20f2c410eba8301fe1d460a2
Merge branch 'maint'