51469a Merge remote branch 'origin/el5/master'

Merged and Committed by rathann 8 years ago
0 file changed. 0 lines added. 0 lines removed.
    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore
    	crm114-rpm.patch
    	crm114.spec
    	sources