Merge branch 'master' of github.com:CyberDomovoy/friendica into threaded_items
authorDomovoy <domovoy@errlock.org>
Fri, 27 Jul 2012 06:27:24 +0000 (08:27 +0200)
committerDomovoy <domovoy@errlock.org>
Fri, 27 Jul 2012 06:27:24 +0000 (08:27 +0200)

Trivial merge