Merge branch 'master' of scm.uninett.no:maalepaaler/qstream

debian/changelog

+qstream (1.2-5) unstable; urgency=low
+
+  * add iptv dirs (jk)
+  * nopoll as a parameter do have less ficed paths (oak)
+  * bug in qstream-poll-list second parameter (oak)
+  * bug in debian/qstream.cron.d (oak)
+
+ -- Jon K Hellan <jon.kare.hellan@uninett.no>  Tue, 28 Jan 2014 14:44:58 +0100
+
 qstream (1.2-4) unstable; urgency=low
 
   * Fix typo