bstrdsmkr/1Channel — pull request #129 by tknorris (2014-06-17 19:34:50+00:00)
Title: Merged mk01's get_sources changes into the resume branch.

This is to merge in mk01's changes to get_sources. There were conflicts but I think I merged it correctly.