Caleb James DeLisle 03378e6d62 Merge branch 'master' of git://github.com/jeffluo35/cjdns into crashey 9 vuotta sitten
..
AdminClient.c 6a67293cf2 moved cjdroute2.c into /client/ directory 9 vuotta sitten
AdminClient.h 6a67293cf2 moved cjdroute2.c into /client/ directory 9 vuotta sitten
Configurator.c b5dcd519e9 Use util/Defined.h instead of preprocessor macros 9 vuotta sitten
Configurator.h 6a67293cf2 moved cjdroute2.c into /client/ directory 9 vuotta sitten
cjdroute2.c 03378e6d62 Merge branch 'master' of git://github.com/jeffluo35/cjdns into crashey 9 vuotta sitten