Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Tue, 28 Jan 2014 17:13:46 +0000 (12:13 -0500)
committerDan Scott <dscott@laurentian.ca>
Tue, 28 Jan 2014 17:13:46 +0000 (12:13 -0500)
commita26d19abd8a70446bd529d4fd1fc24c119d2728b
treef8ef628d52a3e9d1d6f2b39187235e6db1137bb2
parentd4f020dab88b370e39c5059dd7a781b0b46d592d
parentf481e8fa616c254b81c54fc0fde3f1e4410a70b0
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac