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, 17 deletions

diff --git a/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/exceptions.py b/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/exceptions.py
deleted file mode 100755
index 1ad1a616..00000000
--- a/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/exceptions.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Exceptions used throughout package"""
-
-
-class InstallationError(Exception):
-    """General exception during installation"""
-
-
-class UninstallationError(Exception):
-    """General exception during uninstallation"""
-
-
-class DistributionNotFound(InstallationError):
-    """Raised when a distribution cannot be found to satisfy a requirement"""
-
-
-class BadCommand(Exception):
-    """Raised when virtualenv or a command is not found"""