2ec6884 Merge branch 'f14'

Merged and Committed by Siddhesh Poyarekar 13 years ago
    Merge branch 'f14'
    
    Add user_photos to permissions required. Fixes bz #666512.
    
    Conflicts:
    	shotwell.spec
    
        
file modified
+7 -1