From: Jim <jim.pryor@nyu.edu>
Date: Wed, 4 Feb 2015 21:17:40 +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=f40bb9987d5f57b2013281a631351c535c5c93c0;hp=-c

Merge branch 'master' into working

* master: (32 commits)
  update for rename of rosetta.mdwn to rosetta1.mdwn
  update for rename of rosetta.mdwn to rosetta1.mdwn
  update for rename of rosetta.mdwn to rosetta1.mdwn
  update for rename of rosetta.mdwn to rosetta1.mdwn
  update for rename of rosetta.mdwn to rosetta1.mdwn
  rename rosetta.mdwn to rosetta1.mdwn
  huh, last edits are not displaying
  tweak markup
  post latest content
  add Prelude
  fix typo, thanks Kyle
  stronger note
  note what's in progress
  note what's in progress
  add comments, paste content from rosetta2
  rename more_rosetta.mdwn to rosetta2.mdwn
  cut content
  create page
  replace content
  update for rename of rosetta2.mdwn to rosetta.mdwn
  ...
---

f40bb9987d5f57b2013281a631351c535c5c93c0