From: perexg <perex@perex.cz>
Date: Mon, 2 Jun 2014 13:21:49 +0000 (+0200)
Subject: Merge pull request #412 from dmarion/osx
X-Git-Tag: v4.1~2009
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fff6f2dbd93d156481b4a81c674b39cd680cc3bb;p=thirdparty%2Ftvheadend.git

Merge pull request #412 from dmarion/osx

fix static port and webroot in avahi and bonjour, add OSX section in README.md
---

fff6f2dbd93d156481b4a81c674b39cd680cc3bb