From: Federico Marani <federico.marani@ymail.com>
Date: Sat, 28 Mar 2009 13:52:01 +0000 (+0000)
Subject: Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4b3f022fc2ff142e6d1cb6740b7f89108cfda292;p=quix0rs-gnu-social.git

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

Conflicts:

	lib/jabber.php
---

4b3f022fc2ff142e6d1cb6740b7f89108cfda292