[Merge] lp:~timo-jyrinki/ubuntu/trusty/resolvconf/fix_lp_1308378 into lp:ubuntu/trusty/resolvconf

[Sebastien Bacher]

setting as merged, it looks like that got uploaded (but you should check the bug report, there is a new comment that indicates the update is creating issues for some users)
-- 
https://code.launchpad.net/~timo-jyrinki/ubuntu/trusty/resolvconf/fix_lp_1308378/+merge/216300
Your team Ubuntu branches is requested to review the proposed merge of lp:~timo-jyrinki/ubuntu/trusty/resolvconf/fix_lp_1308378 into lp:ubuntu/trusty/resolvconf.