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

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

* remotes/upstream/master:
  add ljpost.css
  added the tarball
  added livejournal plugin
  minor fixes

* master:
---

cf5ca02ffc5c6631bd63863d45a1cd6707e34e1d