Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:55:06 +0000 (19:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:55:06 +0000 (19:55 +0100)
commit93cf43ec3febaddfb34522bbcc2f04038c8e6e9e
tree2f977854a4fea4ce8d1ebb91c3e846122c76baed
parent2644df82e6b3610eaf374352ed981bc5d48d2762
parenta2eeed619de3bb257e82f0e06d1a580101bce54c
Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'

* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c':
  changelog: drop redundant new attribute

Conflicts:
Changelog

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