Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Wed, 1 Jul 2015 00:38:44 +0000 (17:38 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Wed, 1 Jul 2015 00:38:44 +0000 (17:38 -0700)
commitab9922a37ca9af76c11e35f0a544910c32029c45
tree6ae6e16b1e7816b7607ad9eefc296a551943411c
parentd3ff7af35d39485c8413bd49906f50eb2bc8ee9a
parentdb860fd2575fb2d506f7b7442729aed9a8848a2c
Merge branch 'sitka_2_8'