Merge branch 'upstream'
-rw-r--r-- 73007 ChangeLog
lrwxrwxrwx 15 INSTALL.txt -> doc/INSTALL.txt
-rw-r--r-- 1541 Makefile
lrwxrwxrwx 12 NEWS.txt -> doc/NEWS.txt
lrwxrwxrwx 14 README.txt -> doc/README.txt
-rw-r--r-- 34520 agpl-3.0.txt
drwxr-xr-x - debian
drwxr-xr-x - doc
drwxr-xr-x - src
drwxr-xr-x - web
drwxr-xr-x - xml