Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 15:57:57 +0000 (16:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 16:06:54 +0000 (17:06 +0100)
commit9b89824f20223c6e84c897540456642211d54e7e
treeeee37f3280b03504e69abc0cf7c7f9a49129cf3b
parentf479c178943fdaee5f8d92f88658c57bec3e40b3
parenta0866c71293db80f271f11176eae72217d773e9a
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  shorten: Fix out-of-array read

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