Caleb James DeLisle 03378e6d62 Merge branch 'master' of git://github.com/jeffluo35/cjdns into crashey %!s(int64=9) %!d(string=hai) anos
..
AdminClient.c 6a67293cf2 moved cjdroute2.c into /client/ directory %!s(int64=9) %!d(string=hai) anos
AdminClient.h 6a67293cf2 moved cjdroute2.c into /client/ directory %!s(int64=9) %!d(string=hai) anos
Configurator.c b5dcd519e9 Use util/Defined.h instead of preprocessor macros %!s(int64=9) %!d(string=hai) anos
Configurator.h 6a67293cf2 moved cjdroute2.c into /client/ directory %!s(int64=9) %!d(string=hai) anos
cjdroute2.c 03378e6d62 Merge branch 'master' of git://github.com/jeffluo35/cjdns into crashey %!s(int64=9) %!d(string=hai) anos