Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Wed, 29 Jun 2011 19:13:19 +0000 (15:13 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 29 Jun 2011 19:13:19 +0000 (15:13 -0400)
commite44125cc766dbe2df5500a3d2502c146de741e37
tree155db4ca67f477660cfaacc92f09bddae84b9f0d
parent63e0bd9b8044c064c1aeb62d5e47996d583a87b6
parent08c539bc8cad0cd19f109ccd6be411b0335dff65
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets