Merge master changes into release candidate branch.

diff --git a/Makefile b/Makefile
index 76f36cd3608b290707a7ad4c4e20d93951a6724c..ff3d7e3fadd5b0eb8e41e59462e0542f1e162ee1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.4
+GIT_VERSION = 0.99.5
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)