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

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

index 8e7810e,2e4fd6e..0e69383
Binary files differ