[ngircd/el6: 3/3] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 5b2a6ac20695652c0374de8cf14154436c032b67
Merge: 3aef6bb d1299fc
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Dec 18 10:13:21 2013 -0700

    Merge remote-tracking branch 'origin/master' into el6

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