commit 36b677ddbdfd312c5d0907b345fc5a3a9d30e273 Merge: bdebccf 20240e6 Author: Stu Tomlinson <stu at nosnilmot.com> Date: Sun Aug 21 16:29:49 2011 +0100 Merge branch 'master' into f14 .gitignore | 1 + pidgin.spec | 21 ++++++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---