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

Fri Jul 29 17:15:55 UTC 2011

The following commit has been merged in the master branch:
commit 83fa0890c0104f8c3cb97f089dcac4053c6750fe
Merge: 3397da0466a7c8bbcffd5a36248a14138c0e1b37 eaa38fbded6c20a1bd162de1368d28cac87eb9f3
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Fri Jul 29 19:16:46 2011 +0200

    Merge branch 'debian'
    
    Conflicts:
    	debian/control


-- 
Git repository for pkg-ossec