Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Mon, 6 Jul 2015 23:16:51 +0000 (16:16 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Mon, 6 Jul 2015 23:16:51 +0000 (16:16 -0700)
commitf45261569ebabe3d07ca6387737d1a3029d6eea9
tree44321194ff14ccca844d6a72aaba0aa42133beb9
parent33bd8bd3972822c2a1cf10fd5fc2e1e05a2e31fe
parenta63eaf0e3738b8cf5ce23dd3671c37ab78285848
Merge branch 'sitka_2_8'

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