Merge commit 'origin/master' into 308
tree18af0a411b54c5e2013fd41a1f4bda80d0d8fdcb
-rw-r--r-- 731 .gitignore
-rw-r--r-- 718 AUTHORS
-rw-r--r-- 17992 COPYING
-rw-r--r-- 39170 ChangeLog
-rw-r--r-- 1835 Makefile.am
-rw-r--r-- 3993 NEWS
-rw-r--r-- 2413 README
-rw-r--r-- 1806 THANKS
-rw-r--r-- 10115 configure.ac
drwxr-xr-x - contrib
drwxr-xr-x - dep
drwxr-xr-x - doc
drwxr-xr-x - sql
drwxr-xr-x - src
drwxr-xr-x - win