Merge branch 'maint'
commit672b58a803effca1d93f4aa9cf2efcca91f4c23f
authorBastien Guerry <bzg@altern.org>
Sun, 12 Jan 2014 23:25:38 +0000 (13 00:25 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 12 Jan 2014 23:25:38 +0000 (13 00:25 +0100)
treeda4db3e7525694922c024ceb63f5fb077995d40b
parent213c2a6aa057b993b0dd461c50a27034fb553faf
parentdac6d880b7233fb345f3bbeebc79b1729daf9682
Merge branch 'maint'