]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 12 Mar 2012 00:33:10 +0000 (20:33 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 12 Mar 2012 00:33:10 +0000 (20:33 -0400)
commitde70b2f30f8cf102a91c23dcbd50754ae7b27d81
tree77d922093d35d329b513f84696b3a87a9403a098
parent6e5f8376090be020b81f8793a2bed65ba9a879a5
parent1401f763eca776052e97c4d270b33f8c4e1c6e4c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: