[Adium-devl] Trunk->SoC Merge!

[Augie Fackler]

Alright folks,
All SoC branches are now up to date as of revision 20269.
They all seemed to merge alright for me, so if you have any  
particular problems get with your mentor or me (or some other dev)  
and we should be able to work things out.
If you guys remove any strings, be sure to put them in the  
DeadStrings-1.1.h file, as we'll merge that with trunk.
I'm planning to do this more often from now on, so it hurts less for  
me. This was kind of a pain.

Peace,
Augie

For Andre (snapping_groups branch):
C      Frameworks/Adium Framework/Source/AIListGroup.m
C      Plugins/Contact List/AIListController.m
C      Plugins/Contact List/AISCLViewPlugin.h
Those are your conflicts, committed per the meeting last night - have  
fun!