Merge branch 'master' of ssh://zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 24 Aug 2010 07:25:41 +0000 (09:25 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 24 Aug 2010 07:25:41 +0000 (09:25 +0200)
commitfbf1c32524a17529a9f55fda661550e367251315
tree065b25addd67003399b85f11e9b68eb5047d89ab
parente7c33e0aa6e9f8cc9999424e3d503d669559a918
parentb454bb9485b568cf0a973a72ef4e4317e03967b4
Merge branch 'master' of ssh://zarb.org/srv/git/booh