Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Sun, 19 Aug 2012 04:39:25 +0000 (00:39 -0400)
committerDan Scott <dscott@laurentian.ca>
Sun, 19 Aug 2012 04:39:25 +0000 (00:39 -0400)
commit9d3b12dd95e5a1f3275f7c992fbb35bf0893e7b0
tree15c180f75d75b15c16b644ca055389433ad6d50a
parent36b6bac7d00560e1fc4660e0fa0f1dcabd29a978
parent485afd90b1782ccf54b859b893462e2537738aaa
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac