Merge remote-tracking branch 'remotes/origin/1.3' into devel

frankmayer · frankmayer · commit c572a2dc3775 · 2013-10-18T04:26:31.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 
-v1.3.devel (xxxx-xx-xx)
+v1.3.0 (2013-05-13)
 -----------------------
 
 * Contributors to this version:
@@ -8,6 +8,8 @@ v1.3.devel (xxxx-xx-xx)
   
 =======================
 
+* Changed PhpDocs @package content to triagens\ArangoDb, closes issue (see https://github.com/triAGENS/ArangoDB-PHP/issues/123)
+
 * [Breaking change] Removed getServerStatus() in favor of getServerStatistics() This breaks intentionally,
 	because of the different data and data structure returned by the server in version 1.3
 
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 # ArangoDB-PHP - A PHP client for ArangoDB
 
-[![Build Status](https://travis-ci.org/triAGENS/ArangoDB-PHP.png?branch=devel)](https://travis-ci.org/triAGENS/ArangoDB-PHP)
-**Version: 1.3.devel**
+[![Build Status](https://travis-ci.org/triAGENS/ArangoDB-PHP.png?branch=1.3)](https://travis-ci.org/triAGENS/ArangoDB-PHP)
+**Version: 1.3.0**
 
 
 [Follow us on Twitter @arangodbphp to receive updates on the php driver](https://twitter.com/arangodbphp)
