Merge branch 'master' of git://github.com/friendica/friendica-addons
authorTobias Hößl <tobias@hoessl.eu>
Wed, 11 Jul 2012 17:47:54 +0000 (17:47 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Wed, 11 Jul 2012 17:47:54 +0000 (17:47 +0000)

Trivial merge