Merge remote-tracking branch 'tstone/upstream'

This commit is contained in:
Corey Innis 2012-10-31 00:19:12 -07:00
commit fb4fed1db2
2 changed files with 8 additions and 0 deletions

View File

@ -0,0 +1,4 @@
<pre><code>code can go here
this is rendered on a second line
</code></pre>

View File

@ -0,0 +1,4 @@
```
code can go here
this is rendered on a second line
```