From: Christine Burns <christine.burns@bc.libraries.coop>
Date: Tue, 30 Jun 2015 17:47:23 +0000 (-0700)
Subject: Merge branch 'sitka_2_8'
X-Git-Url: https://git.sitka.bclibraries.ca/gitweb/?p=sitka%2Fdoc%2Facquisitions.git;a=commitdiff_plain;h=3df16eac4307c22e24ff6350acf875a5280d910e

Merge branch 'sitka_2_8'

Conflicts:
	admin/media/Thumbs.db

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
---

3df16eac4307c22e24ff6350acf875a5280d910e
diff --cc admin/media/Thumbs.db
index 8e7810e,2e4fd6e..0e69383
Binary files differ