Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/openlibrary-read
authorDan Scott <dan@coffeecode.net>
Thu, 2 Jun 2011 01:43:40 +0000 (21:43 -0400)
committerDan Scott <dan@coffeecode.net>
Thu, 2 Jun 2011 01:43:40 +0000 (21:43 -0400)
commitbbd51fbc797dd72904c9668092d112b155fe4bd0
tree7d9bfb25e795b043bb2a6374b66a88b8208a5a8c
parentff8e6c2517d83747dabda5be419019eec2073b17
parentb7502d2c9231cb34ccf03da08e9fd82c8ba12607
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/openlibrary-read