Merge branch 'master' of git://github.com/friendica/friendica-addons
authorTobias Hößl <tobias@hoessl.eu>
Mon, 23 Jul 2012 18:48:56 +0000 (18:48 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Mon, 23 Jul 2012 18:48:56 +0000 (18:48 +0000)

Trivial merge