Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_...
authorDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:14:35 +0000 (12:14 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:14:35 +0000 (12:14 -0400)
commit4b01b1557aabcd25a603453149fe4cd13c0d7278
treec48073c51a21ce09d6140df59ffa89856703ef30
parentca247807e83a95d183101f77e5bd00392a9d99ad
parent378be91d02322231e65daf67cabd4cadad4b3e68
Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery