From: Michael Tremer Date: Sun, 17 Jun 2012 18:27:19 +0000 (+0200) Subject: Merge remote-tracking branch 'jlentfer/foomatic' into next X-Git-Tag: v2.11-core61^2~29 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=df106d88e5a7eeafb9298b0febbe02e9a349728f;hp=-c Merge remote-tracking branch 'jlentfer/foomatic' into next --- df106d88e5a7eeafb9298b0febbe02e9a349728f