Merge commit '5bc223b15d064e328ff90b0241fa1191f1d2786d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:22:25 +0000 (17:22 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:22:25 +0000 (17:22 +0100)
commit5236cf871818e0df256c18aecd3abfe88b428027
treec02b06f6c841c8ff5af06525eab13fc15ebbc743
parent99f2a563889285b8be3e87fb5c5ba8c86a104785
parent5bc223b15d064e328ff90b0241fa1191f1d2786d
Merge commit '5bc223b15d064e328ff90b0241fa1191f1d2786d'

* commit '5bc223b15d064e328ff90b0241fa1191f1d2786d':
  r3d: fix an invalid read introduced in 6bf4c1d

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>