Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 19:47:04 +0000 (15:47 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 19:47:04 +0000 (15:47 -0400)
commit8325b05b5e4a94091368a6407d3aba2b6371a78d
tree4c4d9f671273072025e03c68dfe4b3ab2ce75a5f
parentb8b78e8608484a7891673dd102119d63f8dfc0fa
parentf0b408bc6822b9b8be150c9af5947748edba06f2
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement