Merge branch 'master' into scan-test

diff --git a/version.sh b/version.sh
index 938a65d0ac3a51493e656104ebb77434a32566d4..dbd35d175d3ba0772e420aef1b1043f2d421ba46 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION="0.9.6"
+VERSION="0.9.7"
 OUT="version.h"
 
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then