Merge branch 'master' of git://github.com/richbeales/Tiny-Tiny-RSS into richbeales...

author Andrew Dolgov <fox@madoka.volgo-balt.ru>

Fri, 22 Mar 2013 05:36:47 +0000 (09:36 +0400)

committer Andrew Dolgov <fox@madoka.volgo-balt.ru>

Fri, 22 Mar 2013 05:36:47 +0000 (09:36 +0400)
author Andrew Dolgov <fox@madoka.volgo-balt.ru>
Fri, 22 Mar 2013 05:36:47 +0000 (09:36 +0400)
committer Andrew Dolgov <fox@madoka.volgo-balt.ru>
Fri, 22 Mar 2013 05:36:47 +0000 (09:36 +0400)
diff --cc include/functions.php
Simple merge
diff --cc register.php
Simple merge
author	Andrew Dolgov <fox@madoka.volgo-balt.ru>
	Fri, 22 Mar 2013 05:36:47 +0000 (09:36 +0400)
committer	Andrew Dolgov <fox@madoka.volgo-balt.ru>
	Fri, 22 Mar 2013 05:36:47 +0000 (09:36 +0400)
		1	2
include/functions.php	patch \|	diff1 \|	diff2 \|	blob \| history
register.php	patch \|	diff1 \|	diff2 \|	blob \| history