Merge branch 'master' of github.com:CatoTH/friendica-addons
authorTobias Hößl <tobias@hoessl.eu>
Mon, 4 Jun 2012 17:19:40 +0000 (17:19 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Mon, 4 Jun 2012 17:19:40 +0000 (17:19 +0000)

Trivial merge