Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge remote-tracking branch 'mainstream/master'
fixes bug in management command and xml template
Merge branch 'master' of github.com:fitoria/askbot-devel into solrmultilang