Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 18:41:40 +0000 (11:41 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 18:41:40 +0000 (11:41 -0700)
Conflicts:
admin/media/Thumbs.db

1  2 
admin/media/Thumbs.db

index 16a132e,2538817..f9f4ffb
Binary files differ