Paul Baranowski 6d39af6fb9 Merge branch 'master' of dev.sourcefabric.org:airtime ...

Conflicts:
	dev_tools/pr.sh

2011-04-15 14:46:07 -04:00

..

api_clients

-update version string to 1.8.0-alpha

2011-04-05 16:12:42 -04:00

pypo

Merge branch 'master' of dev.sourcefabric.org:airtime

2011-04-15 14:46:07 -04:00

show-recorder

CC-2166 : Packaging improvements

2011-04-15 14:45:10 -04:00