Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Thu, 12 Sep 2013 18:57:05 +0000 (14:57 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 12 Sep 2013 18:57:05 +0000 (14:57 -0400)
commitb8cc9562b0e78634edbd12d3c49a6218db8f4ea6
tree39743223eb907418913719a6f19a348d2013f412
parent1b66af85c6f9077d417fbe590b3a5d1f050d83e7
parent910278f6e7412cb8a7d01811d06367bfca4cf8c5
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac