egf
server commit
vote issue
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar

Conflicts:
	log/searchd.development.pid
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar

Conflicts:
	config/database.yml
	db/sphinx/development/askquestion_delta.sph
Merge branch 'umar' of github.com:usmanasif/Coding-Queue into umar

Conflicts:
	db/sphinx/development/askquestion_core.spa
	db/sphinx/development/askquestion_core.spd
	db/sphinx/development/askquestion_core.spi
	db/sphinx/development/askquestion_core.spp
	db/sphinx/development/askquestion_core.sps
	log/searchd.development.pid