Merge remote-tracking branch 'origin/pr/307'

author Adam Sutton <dev@adamsutton.me.uk>

Wed, 4 Dec 2013 21:52:31 +0000 (21:52 +0000)

committer Adam Sutton <dev@adamsutton.me.uk>

Wed, 4 Dec 2013 21:52:31 +0000 (21:52 +0000)
author Adam Sutton <dev@adamsutton.me.uk>
Wed, 4 Dec 2013 21:52:31 +0000 (21:52 +0000)
committer Adam Sutton <dev@adamsutton.me.uk>
Wed, 4 Dec 2013 21:52:31 +0000 (21:52 +0000)
diff --cc src/input/mpegts/linuxdvb/linuxdvb_frontend.c
Simple merge
author	Adam Sutton <dev@adamsutton.me.uk>
	Wed, 4 Dec 2013 21:52:31 +0000 (21:52 +0000)
committer	Adam Sutton <dev@adamsutton.me.uk>
	Wed, 4 Dec 2013 21:52:31 +0000 (21:52 +0000)