Merge branch 'master' of ssh://git.zarb.org/home/users/gc/gitrepos/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 9 Nov 2013 15:35:20 +0000 (16:35 +0100)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 9 Nov 2013 15:35:20 +0000 (16:35 +0100)

Trivial merge