merge: branch 'lr/ipv4-dhcp-timeout-rh1262922'
authorLubomir Rintel <lkundrak@v3.sk>
Tue, 6 Oct 2015 12:18:02 +0000 (14:18 +0200)
committerLubomir Rintel <lkundrak@v3.sk>
Tue, 6 Oct 2015 12:18:02 +0000 (14:18 +0200)
https://bugzilla.redhat.com/show_bug.cgi?id=1262922


Trivial merge