Merge branch 'acq-po-ui-improvements' into senator-masslnc-acq-integrate
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 8 Mar 2013 03:38:42 +0000 (22:38 -0500)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 8 Mar 2013 03:38:42 +0000 (22:38 -0500)
commit598b65590cfe43f56818b191f09613ee94476193
treeb15e8a94832c7105ef3540a8b78143165b85ab5a
parent6697c88dbb8e29f74c09a6066fafb243cba21a2e
parenta5f44a029ef4af48ab8c61d5d5d99260eaa35090
Merge branch 'acq-po-ui-improvements' into senator-masslnc-acq-integrate

Conflicts:
Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2