fixed some adium bug
fixed adium bug
Merge remote-tracking branch 'origin/master'