From: Jim <jim.pryor@nyu.edu>
Date: Sat, 7 Feb 2015 19:49:32 +0000 (-0500)
Subject: Merge branch 'master' into working
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=9201649f036db0e397214de35bddc445cc0d49f2;hp=5a066aa10dea3befa000fa938b12e41a5df3eb35

Merge branch 'master' into working

* master:
  add _lambda_encodings
  tweak
  add comment
  refine notes
  refine notes
  tweak link
  tweak

Conflicts:
	topics/_lambda_encodings.mdwn
---