Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 18:45:39 +0000 (14:45 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 18:45:39 +0000 (14:45 -0400)

Trivial merge