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)
* qatar/release/9:
  shorten: Fix out-of-array read

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

Trivial merge