]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'tomtom84_friendica/master' into master-2
authortommy tomson <thomas.bierey@gmx.de>
Fri, 2 Mar 2012 16:21:06 +0000 (17:21 +0100)
committertommy tomson <thomas.bierey@gmx.de>
Fri, 2 Mar 2012 16:21:06 +0000 (17:21 +0100)

Trivial merge