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

[Kevin Fenzi]

commit 76c6c7ce74380522dd53e33358324791d34df082
Merge: 39a59af 3a7b423
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Sep 24 13:26:50 2014 -0600

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

 ngircd.spec |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---