Merge x264 (2:0.142.2431+gita5831aa-1) import into refs/heads/workingbranch
authorRaspbian Automatic git importer <root@raspbian.org>
Thu, 22 Dec 2016 06:02:41 +0000 (06:02 +0000)
committerRaspbian Automatic git importer <root@raspbian.org>
Thu, 22 Dec 2016 06:02:41 +0000 (06:02 +0000)

Trivial merge