Merge remote-tracking branch 'origin/master' into pete-fixes
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 24 Jun 2014 20:04:10 +0000 (16:04 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 24 Jun 2014 20:04:10 +0000 (16:04 -0400)
commit676dfa352dbf55a23e0123b47d1affe33c028908
tree27dea8732a4865213680b77471810de2bc0b9c2e
parent0eb77fba3f7de714a7edef1c57491f3c285f6d67
parentf573c35a8f829ac4624f4ef9fbe0d0178a734fa3
Merge remote-tracking branch 'origin/master' into pete-fixes
apps/workbench/app/controllers/application_controller.rb
services/fuse/bin/arv-mount