Fix revert for pages in directories, as seen in issue #736
add option to specify custom template directory
Merge pull request #758 from samer/master

Fix revert for pages in directories
Merge pull request #762 from pdenes/add_template_dir_option

add option to specify custom template directory
Prevent indexing of old versions of a page (fixes #768)
write_page first slash fix
gsub before begin
Add a test for issue #772
Fixes dialog hiding so it doesnt block the UI
Merge pull request #778 from jhogendorn/baddialog

Fixes dialog hiding so it doesnt block the UI
Fix version specifiers

Adjusted the version specs on the two gems that explicitly state they are
SemVer compliant, and fixed up the one dependency that correctly *could* have
used ~> but didn't.
Merge pull request #779 from anchor/semantic-versioning

Fix version specifiers
Merge pull request #776 from eucher/first_slash_in_create

First slash in create
Merge pull request #772 from zorun/master

Prevent indexing of old versions of a page (fixes #768)
Base upload button action on home page url
Merge pull request #780 from peterkeen/upload-base-path

Base upload button action on home page url
Use baseUrl for /uploadFile

Thanks @mpalmer
https://github.com/gollum/gollum/pull/780
Release 2.6.0
Implement the ability to store uploads on a per-page basis

Storing all uploaded files in a single directory kinda sucks when you've got
a largish wiki, or the possibility of filename collisions.  With this patch,
though, you can set `:per_page_uploads => true` in your wiki settings and
have the file uploaded to a directory named for the page you were on when
you clicked 'Upload'.
Merge remote-tracking branch 'upstream/master' into per-page-uploads

Conflicts:
	lib/gollum/public/gollum/javascript/gollum.js