Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 22:23:53 +0000 (23:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 22:23:53 +0000 (23:23 +0100)
* qatar/master:
  cmdutils: update copyright year to 2014.

Conflicts:
cmdutils.c

See: 0b1cfc4f28d81a8a49fdd5589b2eed06477abd61
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge