Merge branch 'sitka_2_10' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/manual...
authorChristine Burns <christine.burns@bc.libraries.coop>
Wed, 18 May 2016 17:15:26 +0000 (10:15 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Wed, 18 May 2016 17:15:26 +0000 (10:15 -0700)

Trivial merge