From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 15 Apr 2009 14:25:26 +0000 (-0400)
Subject: Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5ff8d8d447f306f4ad654d56b47cc6f740321c38;p=quix0rs-gnu-social.git

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

Conflicts:
	actions/public.php
---

5ff8d8d447f306f4ad654d56b47cc6f740321c38