3 commits

Author	SHA1	Message	Date
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	74fad00abe	update tv config	2015-07-25 16:41:29 -04:00
Luke Pulverenti	7a37be78a6	update tuners	2015-07-25 14:11:46 -04:00