Merge branch 'master' of ssh://zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 8 Feb 2011 16:58:21 +0000 (17:58 +0100)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 8 Feb 2011 16:58:21 +0000 (17:58 +0100)
commitbb66f840233136e49a4d8dca9a8cf1311226a1df
treea838327a6899e34fa37dd063683e954ae536c2b9
parent7e8f4edb4b2d747617ee99c494ae782f03c2456b
parentb751f7257bd9940eb11b10198c7ee8fa205c1696
Merge branch 'master' of ssh://zarb.org/srv/git/booh