Merge branch 'master' into 4026-project-move-admin
authorradhika <radhika@curoverse.com>
Mon, 20 Oct 2014 17:49:08 +0000 (13:49 -0400)
committerradhika <radhika@curoverse.com>
Mon, 20 Oct 2014 17:49:08 +0000 (13:49 -0400)
commit2556bf9a17d39e658f91cd9b180848526415ce92
tree661a20444a684614a1d99fac72419a0167e6272e
parent12df2994c114b62b0d07a267fdeeaea389e5adb1
parent3844c251d4db322759a23a6370faefb7c8e27728
Merge branch 'master' into 4026-project-move-admin

Conflicts:
apps/workbench/test/integration/projects_test.rb
apps/workbench/test/integration/projects_test.rb