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)
Conflicts:
admin/media/Thumbs.db

1  2 
admin/media/Thumbs.db

index 82e092a,5aa6700..1f8a5b6
Binary files differ