Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Wed, 15 Aug 2012 15:17:13 +0000 (11:17 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 15 Aug 2012 15:17:13 +0000 (11:17 -0400)
commit22ffd4dbd4e4630f42f364ebba1f813bd108dfc3
treef6ff6a4c52584861d47e9c264a64c8d619d3c22a
parent438f432e9d4c1ab83aaaed563165fd6d98851b17
parent3e941e75c1df46d42cc4fe36e429efb7993b28bc
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac