Merge branch '2.1.x' into devel

Conflicts: python_apps/pypo/install/pypo-initialize.py
2012-08-21 12:07:21 -04:00 · 2012-08-21 12:07:21 -04:00 · 656e5eb429
parent 0ce4c1000b 2a497bf941
commit 656e5eb429
1 changed files with 0 additions and 1 deletions
--- a/python_apps/pypo/install/pypo-initialize.py
+++ b/python_apps/pypo/install/pypo-initialize.py
@ -94,7 +94,6 @@ try:
            #liq_path DNE, which is OK.
            pass

-
        os.symlink(liq_path, symlink_path)
    else:
        print " * Liquidsoap binary not found!"