adium/adium

Merge.
adium-1.5.8 1.5.8
2013-10-13, Thijs Alkemade
e0467f507718
Merge.
int main(int argc, const char *argv[])
{
return NSApplicationMain(argc, argv);
}