From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 12 Mar 2012 00:33:10 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=de70b2f30f8cf102a91c23dcbd50754ae7b27d81;p=friendica.git

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

* remotes/upstream/master:
  community meta tag renamed from "ika"

* master:
---

de70b2f30f8cf102a91c23dcbd50754ae7b27d81