Merge remote-tracking branch 'origin/bugfix/7688-no-dhcp-send-hostname' into stable
commit7c93984e2fffb1c2e6b5ac5e3d178c69fe7672dc
authorTails developers <amnesia@boum.org>
Thu, 14 Aug 2014 10:48:55 +0000 (14 10:48 +0000)
committerTails developers <amnesia@boum.org>
Thu, 14 Aug 2014 10:48:55 +0000 (14 10:48 +0000)
tree8d5c5b608acfa2b48a3581c6930759ac902e8122
parent30da30f627c1eff68fa56be777a9da49e8fb1ce0
parent4b007f8cccbc8f8ea02e60764fc6e9e1155f10d8
Merge remote-tracking branch 'origin/bugfix/7688-no-dhcp-send-hostname' into stable