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

diff --git a/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/commands/bundle.py b/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/commands/bundle.py
deleted file mode 100755
index fb0f7570..00000000
--- a/lib/python2.7/site-packages/pip-0.8.1-py2.7.egg/pip/commands/bundle.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from pip.locations import build_prefix, src_prefix
-from pip.util import display_path, backup_dir
-from pip.log import logger
-from pip.exceptions import InstallationError
-from pip.commands.install import InstallCommand
-
-
-class BundleCommand(InstallCommand):
-    name = 'bundle'
-    usage = '%prog [OPTIONS] BUNDLE_NAME.pybundle PACKAGE_NAMES...'
-    summary = 'Create pybundles (archives containing multiple packages)'
-    bundle = True
-
-    def __init__(self):
-        super(BundleCommand, self).__init__()
-
-    def run(self, options, args):
-        if not args:
-            raise InstallationError('You must give a bundle filename')
-        if not options.build_dir:
-            options.build_dir = backup_dir(build_prefix, '-bundle')
-        if not options.src_dir:
-            options.src_dir = backup_dir(src_prefix, '-bundle')
-        # We have to get everything when creating a bundle:
-        options.ignore_installed = True
-        logger.notify('Putting temporary build files in %s and source/develop files in %s'
-                      % (display_path(options.build_dir), display_path(options.src_dir)))
-        self.bundle_filename = args.pop(0)
-        requirement_set = super(BundleCommand, self).run(options, args)
-        return requirement_set
-
-
-BundleCommand()