Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
authorMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sun, 19 Jun 2011 10:29:03 +0000 (12:29 +0200)
committerMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sun, 19 Jun 2011 10:29:03 +0000 (12:29 +0200)
commit973f25409470a04e2c1db8c4e5fc98f22144599a
tree3e5ee8f6b136f86fb4dfbe764d14f10ccfbebeae
parente58377549f7512c03a2bf8346e82533d77acbd39
parentfb72f54c425e715d804b6b90cd3f622c81dcd050
Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara

Conflicts:
libchimara/style.c
libchimara/style.c