commit 360c665ee5f84ae69bf1878e8e3d38a7ed788220 Merge: 44afb6e da284e0 Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:40:06 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + kremotecontrol.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---