Thomas Waldmann ba977193ce Merge branch 'master' into py3-port ...

Conflicts:
	nsupdate/main/_tests/test_main.py

2013-12-24 21:31:40 +01:00

..

__init__.py

adding nic api tests

2013-10-03 21:58:33 +02:00

test_api.py

Merge branch 'master' into py3-port

2013-12-24 21:31:40 +01:00