]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/audit'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 22:27:48 +0000 (23:27 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 22:27:48 +0000 (23:27 +0100)
Conflicts:
audit/audit.nm

1  2 
audit/audit.nm

diff --cc audit/audit.nm
index 5e36fbb1b5cdd2ee2c263f21af2ad02240f22630,7d2f65adffe09448383d56778f7422dfa39dc188..66017be7b8f9c46a6a6bb781cc9b7ee994462c2c
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = audit
- version    = 2.0.5
- release    = 1
+ version    = 2.1.3
 -release    = 6
++release    = 7
  
  groups     = System/Daemons
  url        = http://people.redhat.com/sgrubb/audit/