From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 1 Mar 2012 17:54:27 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=21aaaa59af1a9ce759d550b5f8502ea6bbc6c9f7;p=friendica-addons.git

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

* remotes/upstream/master:
  xml escape ljpost vars
  Add Thomas Willingham contributed alternate version

* master:
---

21aaaa59af1a9ce759d550b5f8502ea6bbc6c9f7