Merge branch '2.1.x' into devel

Conflicts:
	python_apps/pypo/install/pypo-initialize.py
This commit is contained in:
Martin Konecny 2012-08-21 12:07:21 -04:00
commit 656e5eb429
1 changed files with 0 additions and 1 deletions

View File

@ -94,7 +94,6 @@ try:
#liq_path DNE, which is OK.
pass
os.symlink(liq_path, symlink_path)
else:
print " * Liquidsoap binary not found!"