[z3-checkins] r27146 - in z3/jsonserver/branch: merge/minjson zope2_test/minjson

[reebalazs at codespeak.net]

Author: reebalazs
Date: Fri May 12 19:00:51 2006
New Revision: 27146

Added:
   z3/jsonserver/branch/merge/minjson/
      - copied from r27145, z3/jsonserver/branch/zope2_test/minjson/
Removed:
   z3/jsonserver/branch/zope2_test/minjson/
Log:
Relocate minjson to the merge branch