adium/adium

Some merge cleanup.
AutoLayout
2013-12-31, Frank Dowsett
f99cbd2a38d2
Some merge cleanup.
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Tab Switching Keys</key>
<integer>5</integer>
</dict>
</plist>