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)
commit9be4c38e844598653a52cac46e2e381006a6748a
tree6ae96364442f18ed71eb1f93e8f6cc4b6ee4c1b8
parentd4f4119a96151dda17e396d3e126c03131a4b0e4
parent039d203a899863e70414339c4743307d8667a07a
Merge branch 'acs_NFI' of git.evergreen-ils.org:evergreen/equinox into acs_NFI