friendica/friendica — pull request #646 by annando (2013-03-06 22:28:43+00:00)
Title: OStatus conversations, "vier" and diaspora android client

Trying to complete statusnet conversations sometimes ended up in an endless loop. This hopefully will fix it.

In "vier" I made some more changes to make the side menu static. It isn't perfect by now - but it is okay.

In the index.php I made a small change to make friendica compatible with the android client for diaspora.