adium/adium

adium/adium/
merge adium-1.6 into default

2013-06-12, Frank Dowsett
a3d9cc0cde76