James c0e07dbd9e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/airtimemetadata.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
	utils/airtime-import/airtime-import.py
2011-08-08 10:44:06 -04:00
..
2011-06-02 18:07:48 -04:00
2011-07-19 15:06:35 -04:00
2011-02-22 18:22:31 +01:00