Merge pull request #2842 from tobiasd/20160929-lng

author Michael Vogel <icarus@dabo.de>

Tue, 4 Oct 2016 03:22:38 +0000 (05:22 +0200)

committer GitHub <noreply@github.com>

Tue, 4 Oct 2016 03:22:38 +0000 (05:22 +0200)
author Michael Vogel <icarus@dabo.de>
Tue, 4 Oct 2016 03:22:38 +0000 (05:22 +0200)
committer GitHub <noreply@github.com>
Tue, 4 Oct 2016 03:22:38 +0000 (05:22 +0200)
diff --cc include/pgettext.php
Simple merge
diff --cc mod/register.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Tue, 4 Oct 2016 03:22:38 +0000 (05:22 +0200)
committer	GitHub <noreply@github.com>
	Tue, 4 Oct 2016 03:22:38 +0000 (05:22 +0200)
		1	2
include/pgettext.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/register.php	patch \|	diff1 \|	diff2 \|	blob \| history