Merge branch 'master' of ssh://git.zarb.org/home/users/gc/gitrepos/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Thu, 19 Dec 2013 21:41:09 +0000 (22:41 +0100)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Thu, 19 Dec 2013 21:41:09 +0000 (22:41 +0100)

Trivial merge