]> git.mxchange.org Git - friendica-addons.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 1 Mar 2012 17:54:27 +0000 (12:54 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 1 Mar 2012 17:54:27 +0000 (12:54 -0500)
commit21aaaa59af1a9ce759d550b5f8502ea6bbc6c9f7
tree6637c103e7f721a70ed13a3fb251f52ba184bdc4
parentf5a58f3d3827280253d74b9dd1a56a0fb2e2b636
parent7b86f5babe9ac38fb2c878ba6b21e76f8907a935
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: