Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 14:08:49 +0000 (09:08 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 14:08:49 +0000 (09:08 -0500)
commitdf4cf0ab2d424796bf69cc04315851285921e836
tree0134ea473a90e586e511524789b9049a5dc3e015
parentf77fc352d224ffce59c84285c0e6428b63ac6199
parent6f854c09f38b9ecd4332423a5b7cb16da6c6d0b4
Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery_tpac