[SCM] x264/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/x264

[fabian-guest at users.alioth.debian.org]

Fix error message
Update my email address in the manpage
Update Copyrights of debian packaging files
Add a copyright header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 69ab1869a4ce8ea9ad1c5477ff2619ed64837d83
X-Git-Newrev: e947bb5e819572cedcc764605c394e17c58b3190

The following commit has been merged in the master branch:
commit e947bb5e819572cedcc764605c394e17c58b3190
Merge: fb2c07658f530e261563388e6bebbb0f0f1c57e3 69ab1869a4ce8ea9ad1c5477ff2619ed64837d83
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Nov 20 06:33:49 2014 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/x264

diff --combined debian/x264-10bit.1
index 23ed5aa,61a6692..949b38a
--- a/debian/x264-10bit.1
+++ b/debian/x264-10bit.1
@@@ -6,8 -6,8 +6,8 @@@ x264-10bit <prog> <arguments
  .SH DESCRIPTION
  This is a wrapper script that sets the LD_LIBRARY_PATH variable so that the 10-bit variant of the libx264 shared library is prefered over the regular 8-bit variant. It then calls the program <prog> with the arguments <arguments>.
  .SH OPTIONS
 -This wrapper script takes no arguments. All arguments are passed over to the called program.
 +This wrapper script has no options. All arguments are passed over to the called program.
  .SH SEE ALSO
  x264(1)
  .SH AUTHOR
- Reinhard Tartler <siretart at gmail.com>
+ Reinhard Tartler <siretart at debian.org>

-- 
x264 packaging