Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:46:32 +0000 (08:46 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:46:32 +0000 (08:46 -0500)
commite3e6c02a8935b228dc0ceb4f3f914179b94db604
treef0f1e8b52d6c6a67ce4fe39b9c1648df199b9a67
parent13ccd9f74227ea5d213175c06c81ff8ad1797b94
parentc6cc475e31688ca410bc3b9bfff760540d377d51
Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery_tpac