Merge branch 'master' into next
treec7ae9bcef979452c37a3ab8414c8370da420cfaf
-rw-r--r-- 149 .gitignore
-rw-r--r-- 715 Makefile.am
-rw-r--r-- 8651 VERSION
drwxr-xr-x - config
-rw-r--r-- 2100 configure.ac
drwxr-xr-x - devdoc
drwxr-xr-x - doc
drwxr-xr-x - examples
drwxr-xr-x - m4
drwxr-xr-x - resources
drwxr-xr-x - source
drwxr-xr-x - test
drwxr-xr-x - tools
-rwxr-xr-x 893 version_test.sh