Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 22:26:26 +0000 (18:26 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 22:26:26 +0000 (18:26 -0400)
commit2647445efe699e9a7d6267c7f80fe398c7018f09
tree4a46bb5e7a7cd4e9b5e9018a09d67f07e0c67062
parent9478d69ed9a5ddc74239e09909c078fcdfccab57
parente56a34254da634f34b9e43eaf3f80d6d80ef3f9f
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets