chr1sb/Sick-Beard — pull request #5 by chr1sb (2013-12-09 11:47:51+00:00)
Title: merge dev

merge dev changes