Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 01:10:17 +0000 (02:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 01:10:17 +0000 (02:10 +0100)
commit1d41571bbf0dc1624f8e3b667e9225d43b04019c
tree6206a3af65a887e6aaca5d4319c466a5674590b4
parentf1098eb97d3c15640d3473aeba97e2be22ee0d54
parent3e160652219ff4da433f5672ae1e5f4956abb815
Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815'

* commit '3e160652219ff4da433f5672ae1e5f4956abb815':
  cmdutils: update copyright year to 2015.

Conflicts:
cmdutils.c

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