Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 23 May 2011 16:29:45 +0000 (12:29 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 23 May 2011 16:29:45 +0000 (12:29 -0400)
commit7ad5c52fa15e1d724c1140bf55460d6923f7ceea
treeaffda67def4f8a474a5a9c50e2a7a7ffb5a204ad
parent2bbd3e6b65c118a489297d4a0c73ec66596c5aa8
parent598d111851cbf03c73e6bef7633c1ca13bd72276
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets