Merge remote-tracking branch 'upstream/master' into toc

2012-05-22 12:14:03 -07:00
parent 5f5187e05c 5db1728a3f
commit e77154bf7a
30 changed files with 1418 additions and 287 deletions
@@ -59,6 +59,7 @@ utility, you can run it like so:

    $ gollum --help

+Note that the gollum server will not run on Windows because of [an issue](https://github.com/rtomayko/posix-spawn/issues/9) with posix-spawn.

 ## REPO STRUCTURE