Merge branch 'master' of ssh://git.zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 19 May 2012 20:21:53 +0000 (22:21 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 19 May 2012 20:21:53 +0000 (22:21 +0200)

Trivial merge