Merge trunk at revision 8860

author Frédéric Buclin <LpSolit@gmail.com>

Thu, 9 Jan 2014 21:38:28 +0000 (22:38 +0100)

committer Frédéric Buclin <LpSolit@gmail.com>

Thu, 9 Jan 2014 21:38:28 +0000 (22:38 +0100)
author Frédéric Buclin <LpSolit@gmail.com>
Thu, 9 Jan 2014 21:38:28 +0000 (22:38 +0100)
committer Frédéric Buclin <LpSolit@gmail.com>
Thu, 9 Jan 2014 21:38:28 +0000 (22:38 +0100)
diff --cc skins/standard/global.css
Simple merge
diff --cc template/en/default/global/user-error.html.tmpl
Simple merge
author	Frédéric Buclin <LpSolit@gmail.com>
	Thu, 9 Jan 2014 21:38:28 +0000 (22:38 +0100)
committer	Frédéric Buclin <LpSolit@gmail.com>
	Thu, 9 Jan 2014 21:38:28 +0000 (22:38 +0100)
		1	2
skins/standard/global.css	patch \|	diff1 \|	diff2 \|	blob \| history
template/en/default/global/user-error.html.tmpl	patch \|	diff1 \|	diff2 \|	blob \| history