# HG changeset patch
# User Dan
# Date 1252677462 14400
# Node ID 679916c805994414fd118af7b5a50aef067885e1
# Parent  8fae8fb3cbb1ca45d89dc8d8b4b8890006ead74e# Parent  1a3f374310ca3209426598284a120512d2689827
Scribus <--> Charlie merge

diff -r 1a3f374310ca -r 679916c80599 includes/json2.php
--- a/includes/json2.php	Fri Sep 11 09:55:24 2009 -0400
+++ b/includes/json2.php	Fri Sep 11 09:57:42 2009 -0400
@@ -969,6 +969,15 @@
 
 /**
  * @category   Zend
+ * @package    Zend
+ * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Exception extends Exception
+{}
+
+/**
+ * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
@@ -977,15 +986,6 @@
 {}
 
 /**
- * @category   Zend
- * @package    Zend
- * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Exception extends Exception
-{}
-
-/**
  * Class for encoding to and decoding from JSON.
  *
  * @category   Zend