Merge branch 'master' of ssh://git.zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Sun, 5 Sep 2010 21:00:28 +0000 (23:00 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Sun, 5 Sep 2010 21:00:28 +0000 (23:00 +0200)

Trivial merge