Merge branch 'devel' of github.com:arangodb/arangodb into devel

hkernbach · hkernbach · commit 75ea54e22159 · 2016-03-08T18:29:43.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@
 *.diff
 *.patch
 *.lnk
+Thumbs.db
 
 testresult.json
 
