Merge branch 'master' of github.com:urbit/urbit

This commit is contained in:
C. Guy Yarvin 2014-03-04 11:17:49 -08:00
commit 0645597bb2

View File

@ -262,7 +262,7 @@
0w2g.gLmg4.MtrHQ.A5VmH.WPk6G :: 150, ~ryg, Dan Haffey (fortuna) 0w2g.gLmg4.MtrHQ.A5VmH.WPk6G :: 150, ~ryg, Dan Haffey (fortuna)
0w0 :: 151, ~ryx, Tlon (gleba) 0w0 :: 151, ~ryx, Tlon (gleba)
0w0 :: 152, ~fep, Tlon (gleba) 0w0 :: 152, ~fep, Tlon (gleba)
0w0 :: 153, ~tyr, ~hobmed-hinrym (fidelis) 0w3h.8OnVd.~cI9l.Y1-lK.82Lqb :: 153, ~tyr, ~hobmed-hinrym (fidelis)
0w0 :: 154, ~tus, Tlon (gleba) 0w0 :: 154, ~tus, Tlon (gleba)
0w0 :: 155, ~tyc, Tlon (gleba) 0w0 :: 155, ~tyc, Tlon (gleba)
0w0 :: 156, ~leg, Tlon (gleba) 0w0 :: 156, ~leg, Tlon (gleba)