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

[Stu Tomlinson]

commit a2e23ca9d23be8f0959f883267cf3a924ebd0726
Merge: 4b19343 20240e6
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Sun Aug 21 16:29:40 2011 +0100

    Merge branch 'master' into f15

 .gitignore  |    1 +
 pidgin.spec |   21 ++++++++++++++++++++-
 sources     |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---