]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'origin/master'
authortommy tomson <thomas.bierey@gmx.de>
Thu, 10 May 2012 07:54:47 +0000 (09:54 +0200)
committertommy tomson <thomas.bierey@gmx.de>
Thu, 10 May 2012 07:54:47 +0000 (09:54 +0200)

Trivial merge