Merge branch '1.0'

Browse Source

Conflicts:
	nameserver/server.go
	nameserver/server_test.go

...

This commit is contained in:

Matthias Radestock committed 2015-08-17 18:10:56 +01:00

2 parents 74883c5da8 7fb597a8bf

commit 74e29c8990

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available