From: Andre Noll <maan@systemlinux.org>
Date: Sun, 26 Aug 2012 12:26:00 +0000 (+0200)
Subject: Merge branch 't/releases_branch'
X-Git-Tag: v0.4.12~36
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=fd2ef6eb6b306415f3e3d9ed5004cf982e757656;ds=sidebyside

Merge branch 't/releases_branch'

	18d2c3 Remove all release tarballs from the master branch.
	f82ac2 web: Rename tarball download directory.

Was cooking since 2012-07-28, tested also on athcx.
---

fd2ef6eb6b306415f3e3d9ed5004cf982e757656
diff --cc NEWS
index 84d68d82,84d68d82..65a5ca44
--- a/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,10 @@@
  0.?.? (to be announced) "volatile relativity"
  ---------------------------------------------
  
++	- The "versions" directory has been removed from the master
++	  branch. The tarballs of the old releases are now available
++	  in the new "releases" branch.
++
  --------------------------------------
  0.4.11 (2012-07-20) "mutual diversity"
  --------------------------------------