Merge branch 'master' of https://github.com/friendica/friendica-addons
authorKeith Fernie <me@keithfernie.co.uk>
Sat, 19 May 2012 18:45:53 +0000 (19:45 +0100)
committerKeith Fernie <me@keithfernie.co.uk>
Sat, 19 May 2012 18:45:53 +0000 (19:45 +0100)

Trivial merge