Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Thu, 9 Aug 2012 15:10:40 +0000 (11:10 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 9 Aug 2012 15:10:40 +0000 (11:10 -0400)
commitbef262c0692843646ca005cc037b983de63b1477
tree8a154193a186d00706f8e1c54fe2fbcd82cc5947
parentfc86a5c8096b454bf2a444c46997f6226d799cde
parente869f17039408a699b535c9c4ebbfa468142539b
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_osul