Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 15:44:57 +0000 (11:44 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 15:44:57 +0000 (11:44 -0400)
commit43159af880d19fc9af3b1dab35e41c34ab70e509
treea13f4c3943bd7ba6dee43f1a997436beef709f8e
parent205321a2686917cefa634f132b9fbd055adbdd2f
parent4e53a6eb2355f3eda8828371d954d66e7efc5c65
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets