Merge branch 'sitka_2_10' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/manual...
authorChristine Burns <christine.burns@bc.libraries.coop>
Mon, 2 May 2016 23:18:44 +0000 (16:18 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Mon, 2 May 2016 23:18:44 +0000 (16:18 -0700)
commitb00bbdb245cc6ba0bd5adc5b3bfa6b04c9c17042
tree7ff57861e9c4b5cf661da015dd74cbdaac1a5fa6
parent2de18a037f684ccba6c5bdaca3a0cc828d98aa8e
parentf24b83801b06798fedb2f9514fd09accbfcf130f
Merge branch 'sitka_2_10' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/manual.git into sitka_2_10