adium/adium

merge from default (one day this will go the other way)
PreferencesRedux
2012-02-05, Frank Dowsett
2fccfd63d2f8
file isExecutable
merge from default (one day this will go the other way)
(binary:application/octet-stream)