Naomi Aro 69b4847df3 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention ... Conflicts: python_apps/media-monitor/MediaMonitor.py		2011-06-08 10:23:52 +02:00
..
api_clients	cc-2055: switch-to-init.d	2011-06-02 18:07:48 -04:00
media-monitor	Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention	2011-06-08 10:23:52 +02:00
pypo	-remove apache2 as a daemon start prerequisite since apache may be remote.	2011-06-03 17:40:58 -04:00
show-recorder	Merge branch '1.8.2' into devel	2011-06-06 20:11:11 -04:00
create-pypo-user.py	cc-2055: switch to init.d	2011-06-02 18:07:48 -04:00
remove-pypo-user.py	cc-2055: switch to init.d	2011-06-02 18:07:48 -04:00