Merge remote branch 'friendica/master' into quattro-fontsoptions

author Fabrixxm <fabrix.xm@gmail.com>

Fri, 28 Sep 2012 14:06:00 +0000 (10:06 -0400)

committer Fabrixxm <fabrix.xm@gmail.com>

Fri, 28 Sep 2012 14:06:00 +0000 (10:06 -0400)
author Fabrixxm <fabrix.xm@gmail.com>
Fri, 28 Sep 2012 14:06:00 +0000 (10:06 -0400)
committer Fabrixxm <fabrix.xm@gmail.com>
Fri, 28 Sep 2012 14:06:00 +0000 (10:06 -0400)
diff --cc view/theme/quattro/dark/style.css
Simple merge
diff --cc view/theme/quattro/green/style.css
Simple merge
diff --cc view/theme/quattro/quattro.less
Simple merge
author	Fabrixxm <fabrix.xm@gmail.com>
	Fri, 28 Sep 2012 14:06:00 +0000 (10:06 -0400)
committer	Fabrixxm <fabrix.xm@gmail.com>
	Fri, 28 Sep 2012 14:06:00 +0000 (10:06 -0400)
		1	2
view/theme/quattro/dark/style.css	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/quattro/green/style.css	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/quattro/quattro.less	patch \|	diff1 \|	diff2 \|	blob \| history