    reverse change to setup.py (local thing, accidentally pushed to this branch as part of fixing a master merge conflict) 	modified:   setup.py
    reverse change to setup.py (local thing, accidentally pushed to this branch as part of fixing a master merge conflict)
	modified:   setup.py

hackday-profilers/flocker,wallnerryan/flocker-profiles,jml/flocker,moypray/flocker,jml/flocker,1d4Nf6/flocker,achanda/flocker,wallnerryan/flocker-profiles,jml/flocker,LaynePeng/flocker,wallnerryan/flocker-profiles,adamtheturtle/flocker,hackday-profilers/flocker,w4ngyi/flocker,lukemarsden/flocker,achanda/flocker,Azulinho/flocker,Azulinho/flocker,runcom/flocker,lukemarsden/flocker,moypray/flocker,agonzalezro/flocker,mbrukman/flocker,runcom/flocker,LaynePeng/flocker,agonzalezro/flocker,1d4Nf6/flocker,LaynePeng/flocker,agonzalezro/flocker,runcom/flocker,hackday-profilers/flocker,w4ngyi/flocker,lukemarsden/flocker,AndyHuu/flocker,mbrukman/flocker,adamtheturtle/flocker,w4ngyi/flocker,AndyHuu/flocker,mbrukman/flocker,AndyHuu/flocker,moypray/flocker,Azulinho/flocker,achanda/flocker,1d4Nf6/flocker,adamtheturtle/flocker