Merge branch 'hookhead' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx...

author Andrew Dolgov <fox@fakecake.org>

Wed, 10 Jul 2013 12:41:48 +0000 (16:41 +0400)

committer Andrew Dolgov <fox@fakecake.org>

Wed, 10 Jul 2013 12:41:48 +0000 (16:41 +0400)
author Andrew Dolgov <fox@fakecake.org>
Wed, 10 Jul 2013 12:41:48 +0000 (16:41 +0400)
committer Andrew Dolgov <fox@fakecake.org>
Wed, 10 Jul 2013 12:41:48 +0000 (16:41 +0400)
diff --cc classes/feeds.php
Simple merge
diff --cc include/functions.php
Simple merge
author	Andrew Dolgov <fox@fakecake.org>
	Wed, 10 Jul 2013 12:41:48 +0000 (16:41 +0400)
committer	Andrew Dolgov <fox@fakecake.org>
	Wed, 10 Jul 2013 12:41:48 +0000 (16:41 +0400)
		1	2
classes/feeds.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/functions.php	patch \|	diff1 \|	diff2 \|	blob \| history