Merge branch 'master' of ssh://zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Fri, 3 Sep 2010 07:24:39 +0000 (09:24 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Fri, 3 Sep 2010 07:24:39 +0000 (09:24 +0200)
commita931a9330fba8ccb35e90909e67e4d1b9d769ec7
treed25e8d5391a99c6343ef7e79f6d7de647359421f
parent27b5d1952926a7bf7cd1f1d35305c7dde1c4a195
parent3064799d4b24270f612bc5b910fd3928fdb61d3d
Merge branch 'master' of ssh://zarb.org/srv/git/booh