projects / projects / chimara / chimara.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70635ae 983a2bb)
Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
authorMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sat, 18 Jun 2011 09:30:45 +0000 (11:30 +0200)
committerMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sat, 18 Jun 2011 09:30:45 +0000 (11:30 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.