commit 20087f7dc03a4195d8a11ad0f9b992b49f3bd251
Merge: 14008eb 0393dbd
Author: Nick Bebout <nb at fedoraproject.org>
Date: Mon Jan 24 11:27:14 2011 -0600
Merge branch 'master' into el6
.gitignore | 3 +++
sources | 2 +-
znc.spec | 27 ++++++++++++++++++++-------
3 files changed, 24 insertions(+), 8 deletions(-)
---