From: Andre Noll <maan@systemlinux.org>
Date: Sat, 5 May 2012 10:48:27 +0000 (+0200)
Subject: Merge branch 't/doc'
X-Git-Tag: v0.4.11~22
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=39ec52d7bfec591dcad0d41bcdbdf6d980bf5913;p=paraslash.git

Merge branch 't/doc'
---

39ec52d7bfec591dcad0d41bcdbdf6d980bf5913
diff --cc NEWS
index 4863abe4,4863abe4..dfe779ee
--- a/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,7 @@@
  0.4.11 (to be announced "mutual diversity")
  -------------------------------------------
  
++	- Documentation improvements.
  ------------------------------------------
  0.4.10 (2012-03-30) "heterogeneous vacuum"
  ------------------------------------------