Merge branch 'master' into 303
tree3a3e14c9cd5dc3f7e1eb5ac3208abc65c21e8944
-rw-r--r-- 731 .gitignore
-rw-r--r-- 718 AUTHORS
-rw-r--r-- 17992 COPYING
-rw-r--r-- 34528 ChangeLog
-rw-r--r-- 1835 Makefile.am
-rw-r--r-- 3716 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