Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Apr 2009 14:25:26 +0000 (10:25 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Apr 2009 14:25:26 +0000 (10:25 -0400)
commit5ff8d8d447f306f4ad654d56b47cc6f740321c38
tree113c2546f5fab3687f8101fb33a8a25b5880114d
parent8da76e0810342a90ac006f67cfd73500972f883a
parent8439477201cd59a6c0dba84ddf48eb86a6154199
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Conflicts:
actions/public.php
12 files changed:
actions/all.php
actions/favorited.php
actions/groupmembers.php
actions/groups.php
actions/public.php
actions/replies.php
actions/requesttoken.php
actions/showfavorites.php
actions/showgroup.php
actions/showstream.php
actions/tag.php
lib/action.php