Merge branch 'sitka_2_6' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/acquisit...
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 24 Jun 2014 22:28:40 +0000 (15:28 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 24 Jun 2014 22:28:40 +0000 (15:28 -0700)

Trivial merge