Merge branch 'master' of github.com:django/django into schema-alteration

Conflicts:
	django/db/backends/postgresql_psycopg2/base.py

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/regressiontests/admin_scripts/management/commands/custom_startproject.py b/tests/regressiontests/admin_scripts/management/commands/custom_startproject.py
new file mode 100644
index 0000000000..80c6d6b805
--- /dev/null
+++ b/tests/regressiontests/admin_scripts/management/commands/custom_startproject.py
@@ -0,0 +1,11 @@
+from optparse import make_option
+
+from django.core.management.commands.startproject import Command as BaseCommand
+
+
+class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
+        make_option('--extra',
+                    action='store', dest='extra',
+                    help='An arbitrary extra value passed to the context'),
+        )