Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 7 Jul 2015 17:58:22 +0000 (10:58 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 7 Jul 2015 17:58:22 +0000 (10:58 -0700)
commitc448f08bf44a1c84375fccba02311b01cd74d32b
tree721b3349fcbbfd8d2bf3bcc8c3d29ed7bedd4349
parent324344baf512bf09ce554c440440affb8cf0d6f0
parent42c8f4c37c09ace220cf850b1ee85156e9ea1fc3
Merge branch 'sitka_2_8'

Conflicts:
acq/media/Thumbs.db
admin/media/Thumbs.db
acq/media/Thumbs.db