Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Conflicts:
	actions/public.php

diff --cc actions/all.php
Simple merge

diff --cc actions/favorited.php
Simple merge

diff --cc actions/groupmembers.php
Simple merge

diff --cc actions/groups.php
Simple merge

diff --cc actions/public.php
Simple merge

diff --cc actions/replies.php
Simple merge

diff --cc actions/requesttoken.php
Simple merge

diff --cc actions/showfavorites.php
Simple merge

diff --cc actions/showgroup.php
Simple merge

diff --cc actions/showstream.php
Simple merge

diff --cc actions/tag.php
Simple merge

diff --cc lib/action.php
Simple merge