Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Thu, 19 May 2011 13:52:10 +0000 (09:52 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 19 May 2011 13:52:10 +0000 (09:52 -0400)
commitf32e7d46a3675b84a1f92e730d9745c6c9a2acea
tree0e1993a09d2c48e9e327ecd3cccbd78138a59358
parent34c7bb7a6abb5d6a3b43b151dcd00091c1a230e9
parent0b4b17a2f6713c29ac81cadc0fca53fe4dd959da
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement