Merge branch 'master' of github.com:annando/friendica
authorMichael <icarus@dabo.de>
Wed, 11 Apr 2012 16:47:21 +0000 (18:47 +0200)
committerMichael <icarus@dabo.de>
Wed, 11 Apr 2012 16:47:21 +0000 (18:47 +0200)

Trivial merge