Merge branch 'acs_NFI' of git.evergreen-ils.org:evergreen/equinox into acs_NFI
authorMike Rylander <mrylander@gmail.com>
Mon, 26 Sep 2011 12:40:04 +0000 (08:40 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 26 Sep 2011 12:40:04 +0000 (08:40 -0400)

Trivial merge