Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into feature/tpac_osul_2_7
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:38:23 +0000 (16:38 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:38:23 +0000 (16:38 -0500)
commita6ac427402e242745c6aa0cbeaa50dbdf21706fa
tree63f151b6551e70465f8dcdca4e6d55d8aca0b976
parentf1302e62b4260c0c0a1e0cd3183e56e86aeedf41
parent84dacd6d9c75fe180d13ffa212c733cd1c022ef1
Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into feature/tpac_osul_2_7