[nagios/el6/master: 13/13] Merge branch 'master' into el6/master
Peter Lemenkov
peter at fedoraproject.org
Sat Sep 11 17:18:57 UTC 2010
commit bc074cac08249dba179a7e902d0c853112b208f2
Merge: 24bb21c 5cea535
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat Sep 11 21:18:38 2010 +0400
Merge branch 'master' into el6/master
Conflicts:
.gitignore
nagios.spec
sources
.gitignore | 1 +
nagios.spec | 92 ++++++++++++++++++++++++++++++++++------------------------
sources | 2 +-
3 files changed, 56 insertions(+), 39 deletions(-)
---
More information about the scm-commits
mailing list