Merge git://github.com/friendica/friendica

author Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>

Tue, 19 Jun 2012 20:29:24 +0000 (23:29 +0300)

committer Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>

Tue, 19 Jun 2012 20:29:24 +0000 (23:29 +0300)
author Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>
Tue, 19 Jun 2012 20:29:24 +0000 (23:29 +0300)
committer Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>
Tue, 19 Jun 2012 20:29:24 +0000 (23:29 +0300)
diff --cc boot.php
Simple merge
diff --cc mod/photos.php
Simple merge
author	Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>
	Tue, 19 Jun 2012 20:29:24 +0000 (23:29 +0300)
committer	Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>
	Tue, 19 Jun 2012 20:29:24 +0000 (23:29 +0300)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/photos.php	patch \|	diff1 \|	diff2 \|	blob \| history