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

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