Merge branch 'master' into subtitles
treee3198afe8b8fc86fbba7a3429be4ab619b436693
-rw-r--r-- 145 .gitignore
-rw-r--r-- 117 AUTHORS
-rw-r--r-- 18002 COPYING
-rw-r--r-- 0 ChangeLog
-rw-r--r-- 9512 INSTALL
-rw-r--r-- 95 Makefile.am
-rw-r--r-- 0 NEWS
-rw-r--r-- 152 README
-rwxr-xr-x 207 bootstrap.sh
-rw-r--r-- 915 configure.ac
drwxr-xr-x - include
drwxr-xr-x - src
drwxr-xr-x - test