Merge branch 'sitka_2_6' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/acquisit...
authorChristine Burns <christine.burns@bc.libraries.coop>
Mon, 16 Jun 2014 23:10:00 +0000 (16:10 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Mon, 16 Jun 2014 23:10:00 +0000 (16:10 -0700)

Trivial merge