[Pkg-ossec-devel] [pkg-ossec] 03/03: Merge branch 'test'

[Jose Antonio Quevedo Muñoz]

This is an automated email from the git hooks/post-receive script.

jaqm-guest pushed a commit to branch master
in repository pkg-ossec.

commit f0cc95c14b9214ccae6391438e049844a1eab331
Merge: 8502c35 dbf52f7
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Mon Mar 3 00:04:58 2014 +0100

    Merge branch 'test'

 debian/ossec-hids-local.postrm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ossec/pkg-ossec.git