[ngircd/el6/master: 6/6] Merge remote branch 'origin/master' into el6/master

[Kevin Fenzi]

commit 494579c0fe6f3369155a4f865d19e9643f5c1330
Merge: 190ab08 ef0e12d
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Sun Nov 21 20:39:49 2010 -0700

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

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