commit 5e66a673eb61dd38357595876287e0fae3455de0 Merge: e21dcd3 0e044ab Author: Nick Bebout <nb at fedoraproject.org> Date: Tue Oct 18 20:29:24 2011 -0500 Merge branch 'master' into f15 znc-infobot.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---