[pidgin: 6/7] Merge branch 'master' of ssh://pkgs.fedoraproject.org/pidgin

[Stu Tomlinson]

commit ea3d483128b079beb72b2224513b18bff26f7cbd
Merge: 2691bbc 6ca13b0
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Thu Jul 5 17:24:49 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pidgin

 .gitignore  |    1 +
 pidgin.spec |   18 ++++++++++++++----
 sources     |    2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)
---