adium/adium

adium/adium/
merge adium-1.6 into default

2013-07-13, Frank Dowsett
b998e327b5fd