Merge commit 'e122fb594a5feb6729cce86a70aafd93d10202d8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jun 2014 01:10:10 +0000 (03:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jun 2014 01:10:10 +0000 (03:10 +0200)
commita907fc0b21fadfdb92721843b75fa629d26297c8
tree266335c731c15289a5e509c01e54634be114c659
parentd77ad6ec2d14db84973faf53cc1405d517769391
parente122fb594a5feb6729cce86a70aafd93d10202d8
Merge commit 'e122fb594a5feb6729cce86a70aafd93d10202d8' into release/0.10

* commit 'e122fb594a5feb6729cce86a70aafd93d10202d8':
  Update Changelog for 0.8.13
  Prepare for 0.8.13 Release

Conflicts:
Changelog
RELEASE

merge for metadata only

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