From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 31 Oct 2011 12:07:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/freetype'
X-Git-Url: http://git.ipfire.org/?p=people%2Farne_f%2Fipfire-3.x.git;a=commitdiff_plain;h=f84bbab0c8a48740a3bc66d0918d4520b7efd103

Merge remote-tracking branch 'stevee/freetype'
---

f84bbab0c8a48740a3bc66d0918d4520b7efd103