Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: lib/ShapedJson/Legends.cpp lib/ShapedJson/Legends.h		2014-05-20 17:03:49 +02:00
..
aardvark	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-05-20 17:03:49 +02:00
cerberus	fixed path	2014-04-10 17:32:08 +02:00