]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' into develop
authorFabrixxm <fabrix.xm@gmail.com>
Mon, 6 Jul 2015 14:56:49 +0000 (16:56 +0200)
committerFabrixxm <fabrix.xm@gmail.com>
Mon, 6 Jul 2015 14:56:49 +0000 (16:56 +0200)

Trivial merge