Merge branch 'master' into test

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
This commit is contained in:
Anton Dyudin 2015-01-26 15:55:53 -08:00
commit af3e9e9818

Diff Content Not Available