From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 2 Mar 2012 10:22:50 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=47429a3b582f71d6becdc2f10afaed1a5630566b;p=friendica-addons.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  xmlify the login credentials - just in case

* master:
---

47429a3b582f71d6becdc2f10afaed1a5630566b