52 commits

Author	SHA1	Message	Date
martin	eb74c5718f	Merge branch 'master' of dev.sourcefabric.org:airtime ... Conflicts: python_apps/api_clients/api_client.py	2011-03-29 18:35:57 -04:00
martin	2702363a33	-CC-2044: remove hardcoded settings from application/configs/conf.php ... -rearranged some stuff...some bugs still to go	2011-03-29 18:32:53 -04:00