Merge branch 'master' of github.com:annando/friendica-addons
authorMichael <icarus@dabo.de>
Sat, 19 May 2012 14:55:43 +0000 (16:55 +0200)
committerMichael <icarus@dabo.de>
Sat, 19 May 2012 14:55:43 +0000 (16:55 +0200)

Trivial merge