From 01d646a40272e9e75d94efad4ab0a92d849904e9 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Fri, 10 Jan 2014 16:02:25 +0100
Subject: [PATCH] Merged CHANGELOG

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d2d9a9e9f9..edae872f58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 v1.5.x (XXXX-XX-XX)
 -------------------
 
+* allow `\n` (as well as `\r\n`) as line terminator in batch requests sent to 
+  `/_api/batch` HTTP API.
+
+* use `--data-binary` instead of `--data` parameter in generated cURL examples
+
 * issue #703: Also show path of logfile for fm.config()
 
 * issue #675: Dropping a collection used in "graph" module breaks the graph