Merge branch 'master' into 1969-persistent-switch
authorTom Clegg <tom@curoverse.com>
Fri, 25 Apr 2014 20:53:13 +0000 (16:53 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 25 Apr 2014 20:53:13 +0000 (16:53 -0400)
commit4fa5a3d3958eae7ecce681e0ea7a4ac8cc43e48d
tree7bf12690e44fdd49dc275b7f473ec7435de2c728
parenta28be6d77750a6cbded994612d95ee973cb4c01e
parentb914818fb9e794dab68c428a52666507352a6770
Merge branch 'master' into 1969-persistent-switch
services/api/app/controllers/application_controller.rb