Merged pull requests #260 and #262 from Anton Blanchard
diff --git a/VERSION b/VERSION index 7a7992a..42ac116 100644 --- a/VERSION +++ b/VERSION
@@ -1 +1 @@ -1.0.317 +1.0.318
