Merge commit '489c180451b1cde469f6aeea44f8bdb11cd941d0' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:21:01 +0000 (04:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:21:01 +0000 (04:21 +0100)
* commit '489c180451b1cde469f6aeea44f8bdb11cd941d0':
  Add some bug references to the changelog

Conflicts:
Changelog

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

Trivial merge