Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Tue, 4 Jun 2013 17:50:36 +0000 (13:50 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 4 Jun 2013 17:50:36 +0000 (13:50 -0400)
commitf3d6b990137082eed4fe45e3e0c36737f42505e1
treea06f01217853ffb4793d5e11d8fa72fcde4bd8e1
parent6a6fca11b34e3ae56a56487522846931fea8d268
parent24babd5596ee39eb131d717195504eac74fbc808
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac