3 Commits

Author	SHA1	Message	Date
Seth Call	d89ce4c140	* VRFS-801 - almost working on my dev machine	2014-01-11 04:57:07 +00:00
Seth Call	be2a7ecc48	* removing git merge syntax from jam_ruby	2014-01-09 13:53:47 +00:00
Seth Call	0b723362ae	* adding resque to websocket-gateway	2014-01-09 02:53:04 +00:00