Merge remote-tracking branch 'origin/master' into typedclay

Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2015-01-23 14:39:41 -05:00
commit 5e74c7286b

View File

@ -721,7 +721,7 @@
u3nt(c3__tsls,
u3nt(c3__ktts, c3__a,
u3nt(c3__tsgr, u3nc(c3__cnzy, c3__v),
u3nc(c3__bccm, u3k(p_gen)))),
u3k(p_gen))),
u3nt(c3__tsls,
u3nt(c3__ktts, c3__b,
u3nt(c3__tsgr,