From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Dec 2011 22:27:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/audit'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b828b028ea922d55cbadf7035c9df7a36e1464a;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/audit'

Conflicts:
	audit/audit.nm
---

3b828b028ea922d55cbadf7035c9df7a36e1464a
diff --cc audit/audit.nm
index 5e36fbb1b,7d2f65adf..66017be7b
--- a/audit/audit.nm
+++ b/audit/audit.nm
@@@ -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/