Merge remote-tracking branch 'flapflap/de-network_configuration'master
commitaa265c0b5b2f439f11726f0bf73171fb0347e5bd
authorTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:35:26 +0000 (24 08:35 +0000)
committerTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:35:26 +0000 (24 08:35 +0000)
tree04dcdd273c34c24fb3ec9538d4667f5cb3f7c41b
parentcab9b4c9c70fa1b025bf766a7129b4e2a0c370ee
parent022ce9623d6ca3a46c969831becb3257ff224f89
Merge remote-tracking branch 'flapflap/de-network_configuration'