Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 15:30:43 +0000 (11:30 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 15:30:43 +0000 (11:30 -0400)
commita0690704b2029480ceca89dc1ec0b6d16fee7fc3
tree882e1b7e80cc0f0019f86c0c4d7f586e3afe589c
parentd697916983adee9b66af8d98a21a34419d752bb6
parent804ce3723c05cb44da0dc8fceef68138b709cf13
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets