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

[Kevin Fenzi]

commit fe279614a14d040b49494b3397124d3063d70a26
Merge: a6f3e54 3097474
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Feb 2 18:17:26 2013 -0700

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

 .gitignore     |    1 +
 ngircd.service |   11 +++++++++++
 ngircd.spec    |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 sources        |    2 +-
 4 files changed, 57 insertions(+), 5 deletions(-)
---