Merge commit '68395f8c99393c281a08139d20a7a04398b2fd04'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 17:13:56 +0000 (17:13 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 17:13:56 +0000 (17:13 +0000)
commit06278265239fe1aa6ef0f70d5e7db72ea5af844a
treed576518c7a688bbe128a8474fe290c14fec0eee9
parent4736f8115be411bb0cf24a4386d98c53553f919c
parent68395f8c99393c281a08139d20a7a04398b2fd04
Merge commit '68395f8c99393c281a08139d20a7a04398b2fd04'

* commit '68395f8c99393c281a08139d20a7a04398b2fd04':
  qsvenc: fix a typo

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>