commit 0da84615d66e3221c7d2f1fee925d20d2be2ffa2 Merge: 9d2b8f4 6ae8ef4 Author: Denis Arnaud <denis.arnaud_fedora at m4x.org> Date: Tue Dec 25 23:17:11 2012 +0100 Merge branch 'f18' into f17 airinv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---