Merge branch 'master' of https://github.com/friendica/friendica-addons
authorThomas Willingham <founder@kakste.com>
Sun, 9 Dec 2012 04:42:21 +0000 (04:42 +0000)
committerThomas Willingham <founder@kakste.com>
Sun, 9 Dec 2012 04:42:21 +0000 (04:42 +0000)

Trivial merge