Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
authorMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 18 Jun 2011 20:55:23 +0000 (22:55 +0200)
committerMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 18 Jun 2011 20:55:23 +0000 (22:55 +0200)
commit7eda771842a214ee6c9b60aee0a982253fcc29e6
tree1bdc408111f0350d9a53ff0241ee5418cba047ff
parent6ad6d826dfa832f43fbba11e8bcb811a5938c108
parentbea353f718967322136bfe95b04d1de02084671a
Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara