aef2c77 Merge remote-tracking branch 'origin/master' into el6

Merged and Committed by heffer 11 years ago
    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	dojo.spec
    	sources
    
        
file modified
+1 -0
file modified
+10 -1
file modified
+1 -1