adium/adium

adium/adium/
merge

2012-05-13, Frank Dowsett
a944b9e676d3