Merge branch 'master' of github.com:oetiker/rrdtool-1.x

Conflicts:
	.travis.yml

diff --cc .travis.yml
index fd3d292ba1a455e32a24d55d166daa70a3a3bb2f,63bc3bdcb462345db3b7ee70e1ba453da91511e4..e44cd25ded60a793edfbccf54624bf78c822eac7
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -8,16 -8,16 +8,17 @@@ perl
    - "5.8"
  
  install: 
-   - sudo apt-get install autopoint libdbi-dev tcl-dev lua5.1 liblua5.1-0-dev 
+   - sudo apt-get install autopoint libdbi-dev tcl-dev lua5.1 liblua5.1-0-dev valgrind
 +  - sudo pip install cpp-coveralls --use-mirrors
  
  before_script:
    - ./MakeMakefile
  
  script:
    - ./configure --prefix=/opt/rrdtool-master
 -  - make
 +  - make CFLAGS="-g -fprofile-arcs -ftest-coverage"
-   - ./tests/alltests
+   - make check
+   - make check TESTS_STYLE=valgrind
    - sudo make install
    - /opt/rrdtool-master/bin/rrdtool
    - /opt/rrdtool-master/share/rrdtool/examples/4charts.pl