Merge branch 'master' of github.com:friendica/friendica-addons
authorThomas Willingham <founder@kakste.com>
Thu, 24 May 2012 16:31:14 +0000 (17:31 +0100)
committerThomas Willingham <founder@kakste.com>
Thu, 24 May 2012 16:31:14 +0000 (17:31 +0100)

Trivial merge