Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp

.gitignore

@@ -20,6 +20,7 @@ mr-*.h
 
 Doxygen/doc/
 Doxygen/manuals/
+Doxygen/website/
 Doxygen/wiki/
 Doxygen/xml/
 

CHANGELOG

@@ -32,6 +32,8 @@ v1.1.beta1 (2012-XX-XX)
   - if the length of the HTTP headers is greated than the maximum allowed size (1 MB),
     the server will fail with HTTP 431 (request header fields too large)
 
+* upgraded to Doxygen 1.8.0
+
 * issue #247: added AQL function MERGE_RECURSIVE
 
 * issue #246: added clear() function in arangosh
@@ -170,6 +172,10 @@ v1.1.beta1 (2012-XX-XX)
   as before. The Javascript API in the shell also offers a new update() method in extension to
   the previously existing replace() method.
 
+v1.0.2 (2012-XX-XX)
+-------------------
+
+* added autoload for modules
 
 v1.0.1 (2012-09-30)
 -------------------