Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Jun 2012 17:17:22 +0000 (19:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Jun 2012 17:17:22 +0000 (19:17 +0200)
* qatar/release/0.8:
  cmdutils: update copyright year to 2012.

Conflicts:
cmdutils.c

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

Trivial merge