Scribus <--> Charlie merge
authorDan
Fri, 11 Sep 2009 09:57:42 -0400
changeset 1112 679916c80599
parent 1111 8fae8fb3cbb1 (diff)
parent 1110 1a3f374310ca (current diff)
child 1113 000791abdc7e
Scribus <--> Charlie merge
--- 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