modified:   rss_log.py
Merge branch 'master' of https://github.com/edlongman/whileaway

Conflicts:
	rss_log.py

	modified:   rss_log.py