From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 29 Feb 2012 12:00:54 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f5a58f3d3827280253d74b9dd1a56a0fb2e2b636;p=friendica-addons.git

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

* remotes/upstream/master:
  rebuild tgz
  seems the subject isn't really required, contrary to the docs.
  inconsistent file extension
  some small improvements to ljpost
  descriptive text for qcomment settings
  ljpost typos

* master:
---

f5a58f3d3827280253d74b9dd1a56a0fb2e2b636