Merge branch 'sitka_2_6' into Acq26
authorChristine Burns <christine.burns@bc.libraries.coop>
Mon, 16 Jun 2014 23:09:00 +0000 (16:09 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Mon, 16 Jun 2014 23:09:00 +0000 (16:09 -0700)
commitb484446eb5a07bfac91c1778edf63b41959885a9
tree4ec237c3a8858bd8587ffde835503dbe2cccfeae
parentc9d39701dd0e1f71cd8d28ddbe7d2bafa2144395
parent85b0011b1a0af8650624051f2668fb2b6d0d83da
Merge branch 'sitka_2_6' into Acq26

Conflicts:
intro/acq-new-features.xml

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
intro/acq-new-features.xml