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

[Jon Ciesla]

commit 88c2965b2be6d40d328012834373720f211ee83d
Merge: b42219c 3d38dd1
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed May 30 14:45:49 2012 -0500

    Merge branch 'master' into f17

 .gitignore  |    1 +
 pidgin.spec |   13 ++++++++++---
 sources     |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---