Merge pull request #44 from tonybaldwin/master
authorfriendica <info@friendica.com>
Fri, 13 Apr 2012 04:18:10 +0000 (21:18 -0700)
committerfriendica <info@friendica.com>
Fri, 13 Apr 2012 04:18:10 +0000 (21:18 -0700)
irc admin


Trivial merge