d7f4eeea2c
Conflicts: lib/gollum/frontend/app.rb lib/gollum/markup.rb test/test_markup.rb
Conflicts: lib/gollum/frontend/app.rb lib/gollum/markup.rb test/test_markup.rb