From: Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Date: Sun, 19 Jun 2011 10:29:03 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
X-Git-Tag: v0.9~73
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=973f25409470a04e2c1db8c4e5fc98f22144599a;hp=973f25409470a04e2c1db8c4e5fc98f22144599a;p=projects%2Fchimara%2Fchimara.git

Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara

Conflicts:
	libchimara/style.c
---