Merge commit 'fc53a09909ae046dbe4d339bffc744cfc328253e' into release/1.1

* commit 'fc53a09909ae046dbe4d339bffc744cfc328253e':
  cmdutils: update copyright year to 2014.

Conflicts:
	cmdutils.c

No change as the copyright year has already been fixed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-21 14:25:01 +02:00

Diff Content Not Available