Merge pull request #45 from annando/master

author friendica <info@friendica.com>

Thu, 23 Feb 2012 04:21:05 +0000 (20:21 -0800)

committer friendica <info@friendica.com>

Thu, 23 Feb 2012 04:21:05 +0000 (20:21 -0800)
author friendica <info@friendica.com>
Thu, 23 Feb 2012 04:21:05 +0000 (20:21 -0800)
committer friendica <info@friendica.com>
Thu, 23 Feb 2012 04:21:05 +0000 (20:21 -0800)
diff --cc boot.php
Simple merge
diff --cc include/api.php
Simple merge
diff --cc include/poller.php
Simple merge
author	friendica <info@friendica.com>
	Thu, 23 Feb 2012 04:21:05 +0000 (20:21 -0800)
committer	friendica <info@friendica.com>
	Thu, 23 Feb 2012 04:21:05 +0000 (20:21 -0800)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/poller.php	patch \|	diff1 \|	diff2 \|	blob \| history