Merge remote-tracking branch 'origin/master'

examples/migrate-south

@@ -7,9 +7,8 @@ trap "rm -rf -- '$TMPDIR'" EXIT HUP INT TERM
 virtualenv --system-site-packages "$TMPDIR"
 . "$TMPDIR/bin/activate"
 
-pip install django==1.6.5
+pip install "Django>=1.6,<1.7"
 pip install south
 
-CMD="$(command -v django-admin)"
 export PYTHONPATH=`pwd`
-python "$CMD" migrate "$@"
+django-admin.py migrate "$@"