From: Friendika <info@friendika.com>
Date: Tue, 24 May 2011 01:17:02 +0000 (-0700)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=78b2db3a9840f551c951bf0a58a54cce08133bcf;p=friendica.git

Merge branch 'fabrixxm-master'

Conflicts:
	boot.php
---

78b2db3a9840f551c951bf0a58a54cce08133bcf