Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Fri, 21 Jun 2013 04:04:50 +0000 (00:04 -0400)
committerDan Scott <dscott@laurentian.ca>
Fri, 21 Jun 2013 04:04:50 +0000 (00:04 -0400)
commitf9400f318b627c4dac7c7c4ffe96c2913dea49d3
treec6f253e765a18a9449b5f041a74affda25d63d64
parent9961a5580f704670c01a6fce8118ff24f01d6b4b
parentcb2144341639b8648ba116c47130697f9fa0db2e
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac