Merge branch 'master' into 2756-eventbus-in-workbench
authorradhika <radhika@curoverse.com>
Wed, 21 May 2014 22:43:28 +0000 (18:43 -0400)
committerradhika <radhika@curoverse.com>
Wed, 21 May 2014 22:43:28 +0000 (18:43 -0400)
commitea17ec3d053bd2f792730c5ea74d03109ef942ce
treed6e670f33f1b9cb4588abc8503a55d430423cc69
parenta46ebd3da9f41522abde23685bba92f538f76f03
parentc2e70e05178c9569e9de2ac5b3ef47440c49efc5
Merge branch 'master' into 2756-eventbus-in-workbench

Conflicts:
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/app/views/layouts/application.html.erb