commit 3227a7aecb42a74b2c68292861c669a6984f9582 Merge: 8f7efe9 6957d85 Author: Nick Bebout <nb at fedoraproject.org> Date: Thu Feb 9 17:04:01 2012 -0600 Merge branch 'master' into f16 znc-infobot.spec | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) ---