Merge branch 'master' into 1969-persistent-switch
authorTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 15:58:33 +0000 (11:58 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 15:58:33 +0000 (11:58 -0400)
commit7b9cff04eb463c666b8126ebc6c4dfcc00a536c0
tree1f6c014e599e900070cec9c5900489edb5a67e6e
parent4fa5a3d3958eae7ecce681e0ea7a4ac8cc43e48d
parent03e570095885982d23e234bce8e1c068314b63af
Merge branch 'master' into 1969-persistent-switch
services/api/app/controllers/application_controller.rb