]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Wed, 6 Jun 2012 06:08:09 +0000 (08:08 +0200)
committerzottel <github@zottel.net>
Wed, 6 Jun 2012 06:08:09 +0000 (08:08 +0200)

Trivial merge