[Merge] lp:~roger.light/ubuntu/vivid/libwebsockets/fix-for-1422623 into lp:ubuntu/libwebsockets

[Roger Light]

Sorry, I must have made a commit without unapplying the quilt patches. I have redone the upstream merge, and overwritten the branch.
-- 
https://code.launchpad.net/~roger.light/ubuntu/vivid/libwebsockets/fix-for-1422623/+merge/249969
Your team Ubuntu branches is subscribed to branch lp:ubuntu/libwebsockets.