]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Wed, 21 Mar 2012 07:08:23 +0000 (08:08 +0100)
committerzottel <github@zottel.net>
Wed, 21 Mar 2012 07:08:23 +0000 (08:08 +0100)

Trivial merge