Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Sun, 15 May 2011 17:42:05 +0000 (13:42 -0400)
committerMike Rylander <mrylander@gmail.com>
Sun, 15 May 2011 17:42:05 +0000 (13:42 -0400)
commitac617a68b454b80537baaa493d51e4f7c2946d1d
treee634dcc67323268baa87e62c265fdb189c0565a3
parent4739373824b98ab8b76c3fd4f619e544006fd345
parentcce32dd86098980d1fc87523141f0adf958f9ce5
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets