Merge branch 'thh-strictbdsg' into next

author Thomas Hochstein <thh@inter.net>

Sat, 15 Feb 2014 16:30:08 +0000 (17:30 +0100)

committer Thomas Hochstein <thh@inter.net>

Sat, 15 Feb 2014 16:30:08 +0000 (17:30 +0100)
author Thomas Hochstein <thh@inter.net>
Sat, 15 Feb 2014 16:30:08 +0000 (17:30 +0100)
committer Thomas Hochstein <thh@inter.net>
Sat, 15 Feb 2014 16:30:08 +0000 (17:30 +0100)
diff --cc usevote.cfg
Simple merge
diff --cc usevote.global.cfg
Simple merge
diff --cc uvvote.pl
Simple merge
author	Thomas Hochstein <thh@inter.net>
	Sat, 15 Feb 2014 16:30:08 +0000 (17:30 +0100)
committer	Thomas Hochstein <thh@inter.net>
	Sat, 15 Feb 2014 16:30:08 +0000 (17:30 +0100)
		1	2
usevote.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
usevote.global.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
uvvote.pl	patch \|	diff1 \|	diff2 \|	blob \| history