[znc/el5: 2/2] Merge branch 'master' into el5

[Nick Bebout]

commit 777fdc92d9fd1e74ae7254fbb22d650552f1f253
Merge: a528f2c ac94eac
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu May 15 20:32:42 2014 -0500

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)
---