[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. 837448b36acd824827349b6c13b924a7c189004b

[Jose Antonio Quevedo]

The following commit has been merged in the master branch:
commit 837448b36acd824827349b6c13b924a7c189004b
Merge: edd3486f4f989b94b968b7fb38cb3aa5150dcf2c eae9ba6f2339f32fd5a0fbed1aeeb2768d4038cd
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Tue Aug 2 02:29:39 2011 +0200

    Merge branch 'debian'
    
    Conflicts:
    	debian/ossec-hids-server.postinst
    	debian/ossec-hids-server.preinst


-- 
Git repository for pkg-ossec