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

[Stu Tomlinson]

commit dab4ab4210938640dc524335bd034655b0ef3a0c
Merge: 0941efb cf607de
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Fri Jul 1 01:32:17 2011 +0100

    Merge branch 'master' into f14

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