From: Jim Pryor <profjim@jimpryor.net>
Date: Thu, 16 Sep 2010 01:10:45 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=2b16a9953de04222b4a05a4cfee4d0c12c3c7fc9;hp=e75bdfe04dfe4891b07601e5a7820234503e2f71

Merge branch 'pryor'
---

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 7ee56d4c..ddb43d2c 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -4,7 +4,7 @@ This is the SandBox, a page anyone can edit to learn how to use the wiki.
 
 Here's a paragraph. &alpha; &beta;
 
-Here's another one with *emphasised* text.
+Here's _another_ **one** with *emphasised* text.
 
 # Header