adium/adium

adium/adium/
merge adium-1.6 into EmoticonsMenu
EmoticonsMenu
2013-05-08, Frank Dowsett
2ceee6b6e433