032e51f Merge branch 'f17' into el6

Merged and Committed by apevec 11 years ago
    Merge branch 'f17' into el6
    
    Conflicts:
    	openstack-keystone.spec
    
        
file modified
+1 -1
file modified
+46 -21
file modified
+1 -1