Merge branch 'master' into 3609-arv-ws
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 14:43:34 +0000 (10:43 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 14:43:34 +0000 (10:43 -0400)
1  2 
services/api/lib/eventbus.rb

Simple merge