merge email and mail queues in resque
merge email and mail queues in resque

jhass/diaspora,despora/diaspora,SuperTux88/diaspora,SuperTux88/diaspora,geraspora/diaspora,SuperTux88/diaspora,Flaburgan/diaspora,geraspora/diaspora,jhass/diaspora,diaspora/diaspora,spixi/diaspora,Amadren/diaspora,jhass/diaspora,despora/diaspora,Amadren/diaspora,KentShikama/diaspora,spixi/diaspora,Muhannes/diaspora,diaspora/diaspora,SuperTux88/diaspora,Amadren/diaspora,jhass/diaspora,diaspora/diaspora,Flaburgan/diaspora,Muhannes/diaspora,Muhannes/diaspora,despora/diaspora,KentShikama/diaspora,despora/diaspora,KentShikama/diaspora,Flaburgan/diaspora,geraspora/diaspora,spixi/diaspora,Amadren/diaspora,Muhannes/diaspora,KentShikama/diaspora,Flaburgan/diaspora,geraspora/diaspora,diaspora/diaspora,spixi/diaspora