e7ababc Merge branch 'master' into el6

Merged and Committed by Jared K. Smith 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	drupal7-date.spec
    	sources
    
        
file modified
+1 -0
file modified
+15 -2
file modified
+1 -1