Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 23:35:27 +0000 (16:35 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 23:35:27 +0000 (16:35 -0700)
commitcade58f9e1dac73e2b034bb1afac12f968e5eb86
tree76884b6eaa18dc839d90a1ee272c6d6df8c85ee7
parente95cc12de66c3f78bce9daee9dc12102148a9b44
parentadde0672413c0ff24bbb5a6a88f08b00e8a9084f
Merge branch 'sitka_2_8'