Merge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Dec 2014 20:33:07 +0000 (21:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Dec 2014 20:33:07 +0000 (21:33 +0100)
commit9978916c531d077e359b6cde378115dfc45e172e
treeaf843598e0f90f6791557864fb52cd09cf136c50
parent51f2422c2b7a6d694e967864a1fe6fd94ebec803
parente4a77dc204f80a6876cbd91de9b71c30feebe119
Merge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'

* commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119':
  Make the RELEASE file match with the most recent tag

Conflicts:
RELEASE

Not merged as the tag is not a FFmpeg version

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