Merge branch 'master' into 'master'masteredc404652a86fc3d4165b32cbfda6a9d5d180002
treecfdaa9cf3d297baed5ed693d0f07d7dc88276d7a
-rw-r--r-- 126 AUTHORS
-rw-r--r-- 17992 COPYING
-rw-r--r-- 779195 ChangeLog.old
-rw-r--r-- 9498 INSTALL
-rw-r--r-- 127 MAINTAINERS
-rw-r--r-- 1413 Makefile.am
-rw-r--r-- 9929 NEWS
-rw-r--r-- 3482 README
-rwxr-xr-x 553 autogen.sh
-rw-r--r-- 1502 brasero.doap
-rw-r--r-- 17142 configure.ac
drwxr-xr-x - data
drwxr-xr-x - docs
-rw-r--r-- 6144 git.mk
drwxr-xr-x - help
drwxr-xr-x - libbrasero-burn
-rw-r--r-- 285 libbrasero-burn3.pc.in
drwxr-xr-x - libbrasero-media
-rw-r--r-- 279 libbrasero-media3.pc.in
drwxr-xr-x - libbrasero-utils
drwxr-xr-x - nautilus
drwxr-xr-x - plugins
drwxr-xr-x - po
drwxr-xr-x - src