Albert Santoni 6ca0e340a4 Merge branch '2.5.x-installer' into saas-installer-albert ...

Conflicts:
	python_apps/pypo/pypo/pypofile.py

2015-05-22 18:26:16 -04:00

..

airtime-liquidsoap

…

airtime-playout

…

pyponotify

Merge branch '2.5.x-installer' into saas-installer-albert

2015-05-22 18:26:16 -04:00