Merge branch 'master' of git.evergreen-ils.org:Evergreen into SIP23738
authorMike Rylander <mrylander@gmail.com>
Sun, 5 Jun 2011 14:45:25 +0000 (10:45 -0400)
committerMike Rylander <mrylander@gmail.com>
Sun, 5 Jun 2011 14:45:25 +0000 (10:45 -0400)
commit2bc2f22942720e1318e81d46eedad76ddde3f0ac
tree49c28092112d22c9e756257ff30c58c1da23488d
parentbc28fafc7e69826e249f3f503efde6c25ee6f504
parentdfbf4956fc9ad4c19cda234f4468f23788cf862d
Merge branch 'master' of git.evergreen-ils.org:Evergreen into SIP23738