]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop
authorRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:31:33 +0000 (18:31 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:31:33 +0000 (18:31 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>

Trivial merge