From: Dinko Korunic <kreator@carnet.hr>
Date: Thu, 15 Aug 2013 17:33:08 +0000 (+0200)
Subject: Merge tag 'upstream/2.7'
X-Git-Tag: debian/2.7-1~6
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=ff0e686ac67bbd82b60c277eb324910dbc60f65f;p=ossec-hids.git

Merge tag 'upstream/2.7'

Upstream version 2.7
---

ff0e686ac67bbd82b60c277eb324910dbc60f65f