adium/adium

adium/adium/
merge from default
PreferencesRedux
2012-03-18, Frank Dowsett
dee3db38ae12