[audit/f21: 10/10] fix merge

[Peter Robinson]

commit b0bdaedd6635181eb0dbf004f1488f2b6cea5cd3
Merge: 3ade0ff a0ab087
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Aug 4 14:21:39 2014 +0100

    fix merge

 .gitignore |    4 ++++
 audit.spec |   26 ++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
---