Merge branch 'rj/doc-formatting-fix'
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 18:07:50 +0000 (14 11:07 -0700)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 18:07:50 +0000 (14 11:07 -0700)
* rj/doc-formatting-fix:
  howto/revert-a-faulty-merge: fix unescaped '^'s
  howto/setup-git-server-over-http: fix unescaped '^'s


Trivial merge