Merge branch 'maint'
commit53a7683fd74ca20a592cb84dd9f0b086ad12ff27
authorBastien Guerry <bzg@altern.org>
Sun, 28 Oct 2012 10:10:44 +0000 (28 11:10 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 28 Oct 2012 10:10:44 +0000 (28 11:10 +0100)
tree98177c933f39234fe63fa0bf5c08268d145a07cb
parent70e4a89a5d4d1bd353dd5fb586efa6342ec788c3
parentf9e89cb8492c36f62225ad07a3ca59eedfa44f61
Merge branch 'maint'