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 Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Custom Volume Level</key>
<real>1.0</real>
<key>Sound Device Type</key>
<integer>0</integer>
</dict>
</plist>