[dojo/el6: 6/6] Merge remote-tracking branch 'origin/master' into el6

[Felix Kaechele]

commit aef2c77c32f3f2e8c2631a239906f1aaca0cfd4d
Merge: 818ab81 41a9152
Author: Felix Kaechele <felix at fetzig.org>
Date:   Thu Oct 4 18:09:35 2012 +0200

    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	dojo.spec
    	sources

 .gitignore |    1 +
 dojo.spec  |   11 ++++++++++-
 sources    |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---