[purple-facebookchat: 10/11] Merge remote branch 'origin/f13/master'

[Ismael Olea]

commit bbd76b9b4f53af5ee2dd163d6c52404855452518
Merge: 5839c30 f2c3c21
Author: Ismael Olea <ismael at olea.org>
Date:   Sun Aug 29 14:50:58 2010 +0200

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore

 .gitignore |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 868245f,a4d1c55..ae3bbf9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,1 +1,2 @@@
--pidgin-facebookchat-source-1.64.tar.bz2
- /pidgin-facebookchat-source-1.67-1.tar.bz2
++pidgin-facebookchat-source-1.67-1.tar.bz2
++clog