[nagios/f13/master: 10/10] Merge branch 'master' into f13/master
Peter Lemenkov
peter at fedoraproject.org
Sat Sep 11 17:15:20 UTC 2010
commit e384e32e9e542e132e9edee150906245b313a07b
Merge: 3e363e9 5cea535
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat Sep 11 21:15:02 2010 +0400
Merge branch 'master' into f13/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