]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #713 from annando/master
authorfabrixxm <fabrix.xm@gmail.com>
Fri, 5 Jul 2013 19:40:30 +0000 (12:40 -0700)
committerfabrixxm <fabrix.xm@gmail.com>
Fri, 5 Jul 2013 19:40:30 +0000 (12:40 -0700)
ejabberd and friendica


Trivial merge