Merge branch 'master' into context-mergecontext

Conflicts:
	bottle.py
	test/test_environ.py
	test/test_sendfile.py

1 files changed, 10 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 76b9a87..fdb9e72 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,18 @@ PATH := build/python/bin:$(PATH)
 VERSION = $(shell python setup.py --version)
 ALLFILES = $(shell echo bottle.py test/*.py test/views/*.tpl)
 
-.PHONY: release install docs test test_all test_25 test_26 test_27 test_31 test_32 2to3 clean
+.PHONY: release install docs test test_all test_25 test_26 test_27 test_31 test_32 test_33 2to3 clean
 
 release: test_all
 	python setup.py --version | egrep -q -v '[a-zA-Z]' # Fail on dev/rc versions
 	git commit -e -m "Release of $(VERSION)"           # Fail on nothing to commit
 	git tag -a -m "Release of $(VERSION)" $(VERSION)   # Fail on existing tags
+	git push origin HEAD                               # Fail on out-of-sync upstream
+	git push origin tag $(VERSION)                     # Fail on dublicate tag
 	python setup.py sdist register upload              # Release to pypi
-	echo "Do not forget to: git push --tags"
+
+push: test_all
+	git push origin HEAD
 
 install:
 	python setup.py install
@@ -21,7 +25,7 @@ test:
 	which python
 	python test/testall.py
 
-test_all: test_25 test_26 test_27 test_31 test_32
+test_all: test_25 test_26 test_27 test_31 test_32 test_33
 
 test_25:
 	python2.5 test/testall.py
@@ -38,6 +42,9 @@ test_31:
 test_32:
 	python3.2 test/testall.py
 
+test_33:
+	python3.3 test/testall.py
+
 clean:
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +