5b3c808 Merge branch 'master' into f19

Merged and Committed by mrunge 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	python-django-helpdesk.spec
    
        
file modified
+7 -4