Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Thu, 23 Jun 2011 19:54:01 +0000 (15:54 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 23 Jun 2011 19:54:01 +0000 (15:54 -0400)
commitc43a22593335368427f7ec1c2b7a182a91a5ad50
tree8dabff20e4c744cc88c852a39135427f050d8ae9
parentb66b7faac7cb7f510af293127476a2486a4e0b78
parent2d096d936c4467ae407bc2c8ade02d96aa3e752b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement