Frank Celler cf2888b4fc Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 ... Conflicts: CHANGELOG Documentation/Manual/Upgrading12.md Installation/Linux/rc.arangod.OpenSuSE		2013-02-15 12:59:16 +01:00
..
bootstrap	fixed jslint warnings	2013-02-14 11:40:14 +01:00
modules	fixed issue #350: XMLMISSING in wiki references	2013-02-10 16:11:35 +01:00
test-data	Removed some unnecessary files	2012-08-15 00:55:25 +02:00
tests	changed version number to 1.3.alpha	2013-02-06 10:22:58 +01:00