Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Thu, 23 Jun 2011 17:44:37 +0000 (13:44 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 23 Jun 2011 17:44:37 +0000 (13:44 -0400)
commit4a8a5034bb3bbdf17049be706f82cafc28dfe09a
tree85f0af6441eb55679810c93eed9f60b510a40cbe
parent0e2a0d312d6c7b034cfc438a539ea625ba57c2d6
parent1dbba207ec03198615abeadc9237f5582cdfb811
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets