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

[Stu Tomlinson]

commit 74dacc2a80f49c914ebf005ff503320591446e2e
Merge: c7e436b cf607de
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Fri Jul 1 01:31:38 2011 +0100

    Merge branch 'master' into f15

 pidgin.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---