]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' into develop
authorFabio Comuni <fabrix.xm@gmail.com>
Fri, 26 Dec 2014 10:00:01 +0000 (11:00 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Fri, 26 Dec 2014 10:00:01 +0000 (11:00 +0100)

Trivial merge