Merge branch 'devel'
-rw-r--r-- 1268 Makefile.am
drwxr-xr-x - configs
-rw-r--r-- 2344 configure.ac
drwxr-xr-x - m4
drwxr-xr-x - src