Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-08-05 12:36:55 -04:00 · 2011-08-05 12:36:55 -04:00 · 77fb6b1fce
commit 77fb6b1fce
parent f33fc75e01 e39769eaa9
2 changed files with 1 additions and 2 deletions
--- a/2
+++ b/2
@ -5,7 +5,7 @@ Installation instructions are here:
  http://wiki.sourcefabric.org/x/BQBF

 Here is the manual:
-  http://new.flossmanuals.net/airtime/index
+  http://en.flossmanuals.net/airtime/

 To report bugs, visit our bug tracker at: 
  http://dev.sourcefabric.org/browse/CC
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@ -131,7 +131,6 @@ class ShowRecorder(Thread):
            self.logger.info("time: %s" % time)

            name = time+"-"+self.show_name
-            name.encode('utf-8')
            artist = "Airtime Show Recorder".encode('utf-8')

            #set some metadata for our file daemon