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)
commit343bade03b4d3af7d93dffd92152547e4e04e92c
treee37099e34b2354166ae12b1a5ef2cb0a4890aaba
parent8c9b791768e0dc90c0f019cbd15a6653689f6619
parent7d1b2efc520b31cb6bfbeae90a1c1fa73462cc01
merge: branch 'lr/ipv4-dhcp-timeout-rh1262922'

https://bugzilla.redhat.com/show_bug.cgi?id=1262922