Merge branch 'maint'
commit8f8c8cbed026fb8208579b640bb5c25422e3b878
authorBastien Guerry <bzg@altern.org>
Mon, 14 Oct 2013 08:06:08 +0000 (14 10:06 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 14 Oct 2013 08:06:08 +0000 (14 10:06 +0200)
treefb8d42124c8ac765ee992cf59bf2cfa15bcbd5c1
parent66676f7dc79d5ec7a774c1ec06cc27145d03bce2
parentc1ea2c3df94949d346eabc386daaff298a52cf69
Merge branch 'maint'