Merge branch 'master' of github.com:annando/friendica-addons
authorMichael <icarus@dabo.de>
Mon, 18 Jun 2012 06:48:33 +0000 (08:48 +0200)
committerMichael <icarus@dabo.de>
Mon, 18 Jun 2012 06:48:33 +0000 (08:48 +0200)

Trivial merge