From: Thomas <rat@rlyeh-military-affairs>
Date: Tue, 6 Mar 2012 23:56:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dadf80f64479792be85c7026fe1e3c5440066211;p=friendica.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	images/smiley-beard.png
---

dadf80f64479792be85c7026fe1e3c5440066211