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)
commit3645795b346822001d0020b396ad3183d558abf4
tree658c130ea0ddb552c343c3520985672cfe838764
parentb6341fd4e7e2bf87d2c5486cc63227dcc20da481
parent248b448957fadb9071e159e3f621bf03932b44e8
Merge branch 'sitka_2_8'

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