added BRANCH_TODO file, initial commit for the multiauth branch
first
Merge remote branch 'upstream/master'
furjun first commit
project dir change
merge conflict
Merge remote branch 'upstream/master'
bug fix
delete help1
test
Merge branch 'master' of 110.10.225.158:askbot-devel
test
merge  conflict
add manage.py
Merge branch 'master' of 110.10.225.158:askbot-devel
rename project
starting to create model for codeqna
added search indexes templates
fixed bugs in haystack search, now works well with solr, there is still produced by import error
Merge branch 'master' of github.com:ASKBOT/askbot-devel into solr