commit 6f949b071d40b83a7b38b8e8e1f850fce9d80682 Merge: af5e5db 0da8461 Author: Denis Arnaud <denis.arnaud_fedora at m4x.org> Date: Tue Dec 25 23:18:40 2012 +0100 Merge branch 'f17' into el6 airinv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---