adium/adium

adium/adium/
merge from default
AutoLayout
2013-12-31, Frank Dowsett
60d60379bc18