K 10
svn:author
V 3
hrs
K 8
svn:date
V 27
2012-11-18T08:39:36.412689Z
K 7
svn:log
V 154
Merge the following from the English version:

	htdocs/news/Makefile		-> r40052
	htdocs/news/2012-compromise.xml	-> r40052
	share/xml/news.xml		-> r40053

END