Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Mon, 13 Aug 2012 16:41:44 +0000 (12:41 -0400)
committerDan Scott <dscott@laurentian.ca>
Mon, 13 Aug 2012 16:41:44 +0000 (12:41 -0400)
commita25cbc6141a69c841cc9210ba37d1fde817e814a
treeadc5c968d1bf3d77a38e19f11a84bbc93be27c25
parent994c06572c66d60a0d59d2820e34b76ee941443b
parent0729df1434300cc6dbf9a05b0009d33411e6913c
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_osul