Merge branch 'feature/tpac_osul_2_7' of git.evergreen-ils.org:contrib/Conifer into...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 13:27:27 +0000 (08:27 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 13:27:27 +0000 (08:27 -0500)

Trivial merge