Martin Konecny b0eda6e915 Merge branch '2.4.x' ...

Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
	python_apps/pypo/pypocli.py
	python_apps/pypo/schedule/telnetliquidsoap.py

2013-05-22 12:07:08 -04:00

..

__init__.py

Major reorganization of the pypo directory.

2013-05-16 13:22:15 -04:00

constants.py

Ensure only telnetliquidsoap has telnet responsibilities

2013-05-16 16:19:00 -04:00

eventtypes.py

Ensure only telnetliquidsoap has telnet responsibilities

2013-05-16 16:19:00 -04:00

listenerstat.py

Ensure only telnetliquidsoap has telnet responsibilities

2013-05-16 16:19:00 -04:00

pure.py

more lintian fixes

2013-05-16 17:37:01 -04:00

pypofetch.py

fix reference to non-existent var

2013-05-21 12:58:19 -04:00

pypofile.py

more lintian fixes

2013-05-16 17:37:01 -04:00

pypoliqqueue.py

more lintian fixes

2013-05-16 17:37:01 -04:00

pypoliquidsoap.py

remove hard-coded string

2013-05-17 11:55:51 -04:00

pypopush.py

more lintian fixes

2013-05-16 17:37:01 -04:00

telnetliquidsoap.py

Merge branch '2.4.x'

2013-05-22 12:07:08 -04:00