Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8: cmdutils: update copyright year to 2012. Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
* qatar/release/0.8: cmdutils: update copyright year to 2012. Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>