Merge branch 'rj/doc-formatting-fix'
commit865156a7cb72a579c144220204fd7b447ca4e50f
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)
tree0e43d15116202baae9c558cfa3b27f9136712b2f
parentc766e6f429f48e4e6e7b5609779e6cca501c31f6
parent78bef06589dc7570f9b52a6c9fca04d6142cc949
Merge branch 'rj/doc-formatting-fix'

* rj/doc-formatting-fix:
  howto/revert-a-faulty-merge: fix unescaped '^'s
  howto/setup-git-server-over-http: fix unescaped '^'s