Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:51:45 +0000 (11:51 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:51:45 +0000 (11:51 -0400)
commitd697916983adee9b66af8d98a21a34419d752bb6
treeeb8aea72fd27c90eb0f82d4c09675ad797963c31
parent0d21d133dc442672187ca686c0e239670620ec7e
parentb066d2c3b129e8d0738a061e23200d8311d251bf
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets