Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Mon, 15 Jul 2013 13:29:43 +0000 (09:29 -0400)
committerDan Scott <dscott@laurentian.ca>
Mon, 15 Jul 2013 13:29:43 +0000 (09:29 -0400)
commit5b3119ecfdd9ffba6d988b59cb9b47788d6befb0
tree9dc73730dacda813e5fb64824dd5f6e719c67146
parent5270c5233f7a96d9cdd5decc1c5f8142701972fd
parenta8104c59697bdf36cf3ca7d917625b2160307393
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac