From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Apr 2013 16:12:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'tebert/diffutils'
X-Git-Tag: pango~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=263b10b932811068f9ef3f3e71be5e76fc1ad619;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'tebert/diffutils'
---

263b10b932811068f9ef3f3e71be5e76fc1ad619