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

[Nick Bebout]

commit 3a636495f6388615690494f94bf893a410c2041b
Merge: cf47bd5 ac94eac
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu May 15 20:32:36 2014 -0500

    Merge branch 'master' into el6

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