From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 20 Apr 2013 10:56:48 +0000 (+0200)
Subject: Merge branch 'master' of git://git.pld-linux.org/packages/crossmingw32-harfbuzz
X-Git-Tag: auto/th/crossmingw32-harfbuzz-0.9.16-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=831e58ac992f916992f2868cf76622f6f7c527b0;p=packages%2Fcrossmingw32-harfbuzz.git

Merge branch 'master' of git://git.pld-linux.org/packages/crossmingw32-harfbuzz

Conflicts:
	crossmingw32-harfbuzz.spec
---

831e58ac992f916992f2868cf76622f6f7c527b0