Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:45:36 +0000 (08:45 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 26 Dec 2014 13:45:36 +0000 (08:45 -0500)
commitc6cc475e31688ca410bc3b9bfff760540d377d51
tree25b5c00e9f6af42be0514462e560d4780b7abdb8
parent536978291155df110893e8ef089b3a1f354e9625
parentd8d04d465d50506c05db8dbbe73343605f711393
Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery