Merge x264 (2:0.148.2728+git4d5c8b0-1+rpi1) import into refs/heads/workingbranch
authorRaspbian Automatic git importer <root@raspbian.org>
Fri, 23 Dec 2016 00:35:29 +0000 (00:35 +0000)
committerRaspbian Automatic git importer <root@raspbian.org>
Fri, 23 Dec 2016 00:35:29 +0000 (00:35 +0000)

Trivial merge