Merge branch '1.9.1' into devel

Conflicts: python_apps/pypo/pypopush.py
2011-09-20 14:31:09 -04:00 · 2011-09-20 14:31:09 -04:00 · 3a2eaecad8
commit 3a2eaecad8
parent 19d61ad780 b94004d7f4
7 changed files with 29 additions and 15 deletions
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@ -7,7 +7,7 @@ exec > >(tee install_log.txt)
 exec 2>&1

 if [ "$(id -u)" != "0" ]; then
-	echo "You need root privileges to run this script"
+    echo "Please run as root user."
 	exit 1
 fi