adium/adium

merge adium-1.6 into default

2014-07-20, Frank Dowsett
fb9288582076
merge adium-1.6 into default
Versions/2.38.2/libgmodule