Merge branch 'master' into 4227-date-display
authorradhika <radhika@curoverse.com>
Wed, 22 Oct 2014 18:55:55 +0000 (14:55 -0400)
committerradhika <radhika@curoverse.com>
Wed, 22 Oct 2014 18:55:55 +0000 (14:55 -0400)
commitff36aa7e753a28cb36bd13e3cd3bbbe4c6617265
tree17d1a4c9d9fc7876da0c1f4b0f8803a4218e9586
parent99ad159b229c312ef6625e6ef042c33d0db524b9
parent83fc1e7b7e621be38e43d3d97bd32447ef846eae
Merge branch 'master' into 4227-date-display

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