Slightly more correct buckets
handle weird non-cannonical self-routes
Fixing #530, thanks Daktyl for the patch
Merge branch 'master' into crashey
Check a condition which should never occur
Moved DefaultInterfaceController to interface/InterfaceController since there are no other IFCs, improced ifc peerStats state info, stopped counting a session as established until the underlying CA session is *completely* established.
Merge branch 'jshint-ignore' of git://github.com/kbillings/cjdns into crashey
Merge branch 'grammar' of https://github.com/kbillings/cjdns into crashey
Android: Improved the README and updated the build script to use
the (standard) $ANDROID_NDK var if it exists and $NDK isn't set.
Merge branch 'patch-1' of https://github.com/descention/cjdns into crashey
Merge branch 'buckets' of https://github.com/Arceliar/cjdns into crashey
Merge branch 'master' of git://github.com/prurigro/cjdns into crashey
Allow to build on FreeBSD without extra env vars
Merge branch 'master' of https://github.com/cjdelisle/cjdns
improvements for nodejs module of `admin`
1) it listens on 127.0.0.1 host - accepts only connections from localhost!
2) it can be started by `npm start`
3) it has correct nodejs and npm version requirements
Merge branch 'master' of https://github.com/vodolaz095/cjdns into crashey
Fix skip make.js steps if exists more one valid python version

Spawn trigger 'close' event after 'error', even if the program does not exist.
use cjdroute --cleanconf instead of the cleanconf binary
And search $PATH for cjdroute
Android: Some touchups to the README in response to Finn's recommendations
Merge branch 'master' of https://github.com/cjdelisle/cjdns