Merge commit '3e16065221'
* commit '3e16065221': cmdutils: update copyright year to 2015. Conflicts: cmdutils.c See:b8db25a333Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1d41571bbf