Merge branch 'authority-control-sets' of git.evergreen-ils.org:evergreen/equinox...
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 15:30:46 +0000 (11:30 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 15:30:46 +0000 (11:30 -0400)

Trivial merge