commit 4a094ce5fb34d406e5d993cfc3b16a938c328feb Merge: ad99096 6201062 Author: Luke Macken <lmacken at redhat.com> Date: Thu Feb 24 15:01:05 2011 -0500 Merge branch 'master' into el5 .gitignore | 1 + bodhi.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) ---