]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Mon, 9 Apr 2012 00:20:34 +0000 (02:20 +0200)
committerzottel <github@zottel.net>
Mon, 9 Apr 2012 00:20:34 +0000 (02:20 +0200)

Trivial merge