Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:59:58 +0000 (13:59 -0500)
committerDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:59:58 +0000 (13:59 -0500)
commit7824734aa8da517ed99e9c483d7282de9b062d4a
tree90008c42e7e82d03539a44cf0b8daac57baed23e
parent27118c310365a30618cba4b9f855daf04cddaffa
parent2adafbec8982f74ddb0c164c1347c74ca7b07993
Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery_tpac