From: Michael Tremer Date: Mon, 20 Jan 2014 19:23:12 +0000 (+0100) Subject: Merge remote-tracking branch 'stevee/avahi-fixes' into next X-Git-Tag: v2.15-beta2~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=146636ae7863022e2bdddccac9ef75b8c58d79e0;p=ipfire-2.x.git Merge remote-tracking branch 'stevee/avahi-fixes' into next --- 146636ae7863022e2bdddccac9ef75b8c58d79e0