adium 4196:261784adbc35: Fixed merge. robotive committed some st...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/261784adbc35
revision:	4196:261784adbc35
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Sep 05 00:36:24 2011 +0200

Fixed merge. robotive committed some stuff he didn't mean to
Subject: adium 4197:fead4f378f2e: robotive committed some stuff he didn't mean to, fixing his merge.

details:	http://hg.adium.im/adium/rev/fead4f378f2e
revision:	4197:fead4f378f2e
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Sep 05 00:40:39 2011 +0200

robotive committed some stuff he didn't mean to, fixing his merge.
Backed out changeset 0520aad6e21e
Subject: adium 4198:4f5618ee14a9: Merged

details:	http://hg.adium.im/adium/rev/4f5618ee14a9
revision:	4198:4f5618ee14a9
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Sep 05 00:41:02 2011 +0200

Merged