Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 17:47:23 +0000 (10:47 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 17:47:23 +0000 (10:47 -0700)
commit3df16eac4307c22e24ff6350acf875a5280d910e
tree48463921facac510863b4e3d0a8136815ec80a24
parentf6e3e12b266d83ca692b9a1b3c621589f0c6e5f1
parent81afcd9b8a45c137b71a30e112c54021c5bd94ec
Merge branch 'sitka_2_8'

Conflicts:
admin/media/Thumbs.db

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
admin/media/Thumbs.db