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

[Stu Tomlinson]

commit 4b193431c29f78fcc6cb556068ad97e669cda937
Merge: 74dacc2 c25745a
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Fri Jul 1 01:33:42 2011 +0100

    Merge branch 'master' into f15

 pidgin-2.8.0-gevolution-compilefix.patch |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)
---