Merge branch 'master' of ssh://gparabola/parabolaweb

Conflicts:
	local_settings.py.example
	media/archweb.css
	packages/templatetags/package_extras.py
	public/views.py
	templates/packages/details.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/search.html
	templates/public/download.html
	templates/todolists/view.html

1 files changed, 0 insertions, 18 deletions

diff --git a/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/runner.py b/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/runner.py
deleted file mode 100755
index be830ad9..00000000
--- a/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/runner.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import sys
-import os
-
-
-def run():
-    base = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    ## FIXME: this is kind of crude; if we could create a fake pip
-    ## module, then exec into it and update pip.__path__ properly, we
-    ## wouldn't have to update sys.path:
-    sys.path.insert(0, base)
-    import pip
-    return pip.main()
-
-
-if __name__ == '__main__':
-    exit = run()
-    if exit:
-        sys.exit(exit)