Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 22:12:00 +0000 (15:12 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 22:12:00 +0000 (15:12 -0700)
commite95cc12de66c3f78bce9daee9dc12102148a9b44
tree66c3ca138486685cdb0e7f342f5e6cff7d3157d0
parent99a1a57e8e3a403e05b70e70c4fb819e259b8aa9
parent0270d65e469f7c669467e2a6f7b9c6457cd1ec28
Merge branch 'sitka_2_8'