Merge branch 'master' into maint

Makefile

@@ -293,7 +293,7 @@ distfile:
 	zip -r org-$(TAG).zip org-$(TAG)
 	gtar zcvf org-$(TAG).tar.gz org-$(TAG)
 
-release:
+makerelease:
 	@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
 	${MAKE} distfile
 	${MAKE} doc
@@ -316,7 +316,7 @@ upload_manual:
 	rsync -avuz --delete doc/guide/ cdominik@orgmode.org:orgmode.org/guide/
 
 relup0:
-	${MAKE} release
+	${MAKE} makerelease
 	${MAKE} upload_release
 
 relup:
@@ -324,8 +324,33 @@ relup:
 	${MAKE} upload_release
 	${MAKE} upload_manual
 
-db:
-	grep -e '(debug)' lisp/*el
+testrelease:
+	git checkout -b testrelease maint
+	git merge -s recursive -X theirs master
+	UTILITIES/set-version.pl $(TAG)
+	git commit -a -m "Release $(TAG)"
+	make distfile TAG=testversion
+	make cleanrel
+	rm -rf org-testversion*
+	git checkout master
+	git branch -D testrelease
+
+release:
+	git checkout maint
+	git merge -s recursive -X theirs master
+	UTILITIES/set-version.pl $(TAG)
+	git commit -a -m "Release $(TAG)"
+	make relup TAG=$(TAG)
+	make cleanrel
+	rm -rf org-$(TAG)
+	rm org-$(TAG)*.zip
+	rm org-$(TAG)*.tar.gz
+	make pushreleasetag TAG=$(TAG)
+	git push origin maint
+	git checkout master
+	UTILITIES/set-version.pl -o $(TAG)
+	git commit -a -m "Update website to show $(TAG) as current release"
+	make updateweb
 
 cleancontrib:
 	find contrib -name \*~ -exec rm {} \;

ORGWEBPAGE/index.org

@@ -123,9 +123,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
 - <2010-04-06 Tue>: Release 6.35
 - <2010-01-10 Sun>: Release 6.34
 
-* Current Version (7.01)
+* Current Version (7.01b)
 
-The current version is 7.01.  To see what has changed in recent
+The current version is 7.01b.  To see what has changed in recent
 releases, check this detailed list of [[file:Changes.html][user-visible changes]].
 
 This package works on Emacs 23 and 22, and (with minor restrictions)
@@ -137,7 +137,7 @@ recent version, but may lag a bit behind the website release.
 
 ** The standard distribution
 
-Download as [[file:org-7.01.zip][zip file]] or [[file:org-7.01.tar.gz][gzipped tar archive]].  These archives contain
+Download as [[file:org-7.01b.zip][zip file]] or [[file:org-7.01b.tar.gz][gzipped tar archive]].  These archives contain
 both the Lisp file org.el and the documentation in PDF and (TeX)Info
 formats.  Follow the instructions for [[http://orgmode.org/manual/Installation.html#Installation][Installation]] and [[http://orgmode.org/manual/Activation.html#Activation][Activation]].