Merge branch 'sitka_2_12' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/manual...
authortji <tina.ji@bc.libraries.coop>
Mon, 15 May 2017 20:17:35 +0000 (13:17 -0700)
committertji <tina.ji@bc.libraries.coop>
Mon, 15 May 2017 20:17:35 +0000 (13:17 -0700)

Trivial merge