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

[Kevin Fenzi]

commit a6f3e5478a490f7be5134f3543a35179f49dc538
Merge: 5bbc10b 36d9b1c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Aug 22 17:17:47 2011 -0600

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

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