Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:40 +0000 (12:24 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:40 +0000 (12:24 -0400)
commitb8b78e8608484a7891673dd102119d63f8dfc0fa
tree45d69ef9bebc188f301d4013b3f4165f9b0ef5ee
parentee539ff57a0252fbf21f84de689e4aa2f2eb3382
parentad0bbbb835fb6185a8b76cc5ae38dd0ec7209cc3
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement