Changeset 328e93f for fedd/deter/__init__.py

Timestamp:

Feb 1, 2013 1:25:43 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

17c6d91

Parents:

9a52a80 (diff), 06a2b49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/deter/__init__.py (modified) (1 diff)

fedd/deter/__init__.py

@@ -5 +5 @@
 from ip_allocator import *
 from ip_addr import *
+from topdl_to_route import *