Merge remote-tracking branch 'stevee/avahi-fixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:23:12 +0000 (20:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:23:12 +0000 (20:23 +0100)
commit146636ae7863022e2bdddccac9ef75b8c58d79e0
tree5ed592814603b4519cf015c23be2c2ef11c04a59
parent057652c5e548c5e0b0e4e07559c21b7916335af9
parent6fe7d6799fd682056dd7900ac1fad17e6de194fa
Merge remote-tracking branch 'stevee/avahi-fixes' into next