Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Thu, 13 Jun 2013 01:16:43 +0000 (21:16 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 13 Jun 2013 01:16:43 +0000 (21:16 -0400)
commitf2a42afa2cd4830363e6d44f647efa23ce18afe3
tree3c297fc034437cc655693f726c0a5977da2e1c43
parent355084f28ffd57ef7bb2b28da064c43de896552f
parent9dad67f69610a7956d0f2d938e7999ea4afa199c
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac