adium/adium

merge adium-1.6 into default

2014-07-20, Frank Dowsett
fb9288582076
merge adium-1.6 into default
syntax: glob
.DS_Store
*.mode*
*.pbxuser
*.perspectivev3
*.xcworkspace
*.xcuserdatad
build
Icon*
Docs
Dependencies/Brew
Dependencies/build
Dependencies/source
Dependencies/Frameworks
Dependencies/build.log
Dependencies/error.log
Dependencies/framework_maker/*.pyc
Resources/*/LC_MESSAGES