Merge master branch changes into release candidate branch.

diff --git a/Makefile b/Makefile
index c0fdaa701f973ec84a9c4524af451432ee2adcf0..57d4f1170c06bfff42cb64a753741fd4fa6fa37c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.5
+GIT_VERSION = 0.99.6
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)