Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:27 +0000 (12:24 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:27 +0000 (12:24 -0400)
commita4cb1856d26be434781201f1bb33973d913771e4
tree0151f4ca18d49df269cd41dfec04aa421e4c1702
parentcaf3697535e4e43c86b6d02a427e2eccf254d6ce
parentad0bbbb835fb6185a8b76cc5ae38dd0ec7209cc3
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
Open-ILS/web/Makefile.am