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

author Federico Marani <federico.marani@ymail.com>

Mon, 16 Mar 2009 22:43:51 +0000 (22:43 +0000)

committer Federico Marani <federico.marani@ymail.com>

Mon, 16 Mar 2009 22:43:51 +0000 (22:43 +0000)
author Federico Marani <federico.marani@ymail.com>
Mon, 16 Mar 2009 22:43:51 +0000 (22:43 +0000)
committer Federico Marani <federico.marani@ymail.com>
Mon, 16 Mar 2009 22:43:51 +0000 (22:43 +0000)
diff --cc config.php.sample
Simple merge
diff --cc lib/jabber.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Federico Marani <federico.marani@ymail.com>
	Mon, 16 Mar 2009 22:43:51 +0000 (22:43 +0000)
committer	Federico Marani <federico.marani@ymail.com>
	Mon, 16 Mar 2009 22:43:51 +0000 (22:43 +0000)
		1	2
config.php.sample	patch \|	diff1 \|	diff2 \|	blob \| history
lib/jabber.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history