adium/adium

adium/adium/
merge from default
PreferencesRedux
2012-04-23, Frank Dowsett
bd02844fc58f