commit acdabff0e2f53f79cab4f58e8f3f06be23e044ee Merge: 2ace30f 3d95ba5 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Tue Nov 6 20:42:07 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kruler.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---