commit a1b9599782118be2341438279c1f433f0c817eb1 Merge: 2691bbc 88c2965 Author: Jon Ciesla <limburgher at gmail.com> Date: Wed May 30 14:46:21 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + pidgin.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) ---