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)
commit67999d3d1275d2e1449946a5f838e5d1933a8439
tree9ae1b43fd8b43c7202f0ed279aa49fdf7dfc2049
parentd18234f31915f5aba523ade54ff75aab062c647f
parent7ce88e5ec41484c452da56853a6897803da9c2a5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: update copyright year to 2014.

Conflicts:
cmdutils.c

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