James 107c100cc4 Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing ...

Conflicts:
	python_apps/media-monitor/airtime-media-monitor

2011-07-19 15:09:55 -04:00

..

api_clients

CC-2567: Install api_client separately from pypo

2011-07-19 12:07:31 -04:00

media-monitor

Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing

2011-07-19 15:09:55 -04:00

monit

cc-2419: media monitor import on start

2011-06-30 18:02:58 -04:00

pypo

Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing

2011-07-19 15:09:55 -04:00

show-recorder

Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing

2011-07-19 15:09:55 -04:00

create-pypo-user.py

-create-pypo-user scripts missing an "import sys"

2011-06-16 17:30:16 -04:00

remove-pypo-user.py

-create-pypo-user scripts missing an "import sys"

2011-06-16 17:30:16 -04:00