Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
authorMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 18 Jun 2011 16:12:23 +0000 (18:12 +0200)
committerMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 18 Jun 2011 16:12:23 +0000 (18:12 +0200)
commit888f4a57809daa1845bb274bbf610c5200e1feb3
tree8931ede4f270b51b4a4ba938d2f712889f3f4200
parent51ea6cf2b7df96766d21f465a6d7a0a3acefbe2d
parent86211c165b2c64ba017e61f6a4353ac685a09c07
Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara