update authorities with new dontmerge info manual3.12.x 3.12.00
authorNicole C. Engard <nengard@gmail.com>
Thu, 21 Aug 2014 13:09:38 +0000 (08:09 -0500)
committerNicole C. Engard <nengard@gmail.com>
Thu, 21 Aug 2014 13:10:44 +0000 (08:10 -0500)
commitb50c3785c1d3ab62d9adf449e975aaa01a69bb41
tree21b486ba31179a6d137fbb90db4b830c02e3097e
parenta9ce0b15d35c138ae2b9208189aafc8c04db086e
update authorities with new dontmerge info

Conflicts:
en/manual.xml
en/manual.xml