fog/fog — pull request #2849 by icco (2014-04-11 09:37:32+00:00)
Title: Fix bugs in disk tests

Wasn't paying attention last night and broke the build. @frodenas mind taking a look?