]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' into develop
authorfabrixxm <fabrix.xm@gmail.com>
Wed, 20 May 2015 19:46:05 +0000 (21:46 +0200)
committerfabrixxm <fabrix.xm@gmail.com>
Wed, 20 May 2015 19:46:05 +0000 (21:46 +0200)

Trivial merge