[pidgin/f15: 7/7] Merge branch 'master' into f15

[Stu Tomlinson]

commit 30b82b61998bbcbf2e3b3164488f0396c74b67b9
Merge: a2e23ca 462770e
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Thu Dec 29 13:03:01 2011 +0000

    Merge branch 'master' into f15

 .gitignore                             |    1 +
 pidgin-2.10.1-fix-msn-ft-crashes.patch |   33 ++++++++++++++++++++++++++++++++
 pidgin.spec                            |   21 +++++++++++++++++++-
 sources                                |    2 +-
 4 files changed, 55 insertions(+), 2 deletions(-)
---