adium-1.4 2607:c42ba7bf95bc: Merge with main branch. Refs #12976

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/c42ba7bf95bc
revision:	2607:c42ba7bf95bc
author:		Andreas Monitzer <am at adiumx.com>
date:		Thu Sep 10 13:56:10 2009 +0200

Merge with main branch. Refs #12976

diffs (13 lines):

diff -r adc383366ee4 -r c42ba7bf95bc Copyright.txt
--- a/Copyright.txt	Sun Sep 06 14:53:09 2009 -0400
+++ b/Copyright.txt	Thu Sep 10 13:56:10 2009 +0200
@@ -75,5 +75,7 @@
 Ngan Pham
 Jay Weatherstone
 Robby Weinberg
+Andreas Monitzer
+Kevin Glowacz
 
 If you have contributed to Adium and are not on this list, please contact us.
diff -r adc383366ee4 -r c42ba7bf95bc Resources/Safari.scpt
Binary file Resources/Safari.scpt has changed