b45bf6 Merge commit '907d6b5138a7660cad96649160f84f29bd3430fe'

Merged and Committed by Adam Williamson 12 years ago
    Merge commit '907d6b5138a7660cad96649160f84f29bd3430fe'
    
    Conflicts:
    	accountsservice.spec
    
        
file modified
+1 -0
file modified
+12 -6
file modified
+1 -1