Merge branch 'master' into 330
tree6370c37d4781e68b470f2e79e3b82de698376062
-rw-r--r-- 885 .gitignore
-rw-r--r-- 718 AUTHORS
-rw-r--r-- 17992 COPYING
-rw-r--r-- 47904 ChangeLog
-rw-r--r-- 1794 Makefile.am
-rw-r--r-- 4863 NEWS
-rw-r--r-- 2414 README
-rw-r--r-- 1806 THANKS
-rw-r--r-- 592 WARNING
-rw-r--r-- 9999 configure.ac
drwxr-xr-x - contrib
drwxr-xr-x - dep
drwxr-xr-x - doc
drwxr-xr-x - m4
drwxr-xr-x - sql
drwxr-xr-x - src
drwxr-xr-x - win