Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/lp894052-version...
authorDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 04:15:40 +0000 (23:15 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 04:15:40 +0000 (23:15 -0500)

Trivial merge