Merge remote-tracking branch 'origin/master' into develop

bee0a410 · Christoph Jentzsch · 5050d20b · b315da61 · bee0a410
Commit bee0a410 authored Oct 21, 2014 by Christoph Jentzsch
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vmIOandFlowOperationsTest.json vmtests/vmIOandFlowOperationsTest.json +1 -1

No files found.
--- a/vmtests/vmIOandFlowOperationsTest.json
+++ b/vmtests/vmIOandFlowOperationsTest.json
@@ -1369,4 +1369,4 @@
            }
        }
    }
-}
\ No newline at end of file
+}