From: W. Trevor King <wking@drexel.edu>
Date: Wed, 21 Jul 2010 18:29:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://einstein/~/public_html/code/git/cookbook
X-Git-Tag: v0.1~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d6ff1a729bb6637508b33c456ae1b758e4470398;p=cookbook.git

Merge branch 'master' of ssh://einstein/~/public_html/code/git/cookbook
---

d6ff1a729bb6637508b33c456ae1b758e4470398