Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <willi@arangodb.com>
Wed, 6 Jan 2016 20:01:52 +0000 (21:01 +0100)
committerWilfried Goesgens <willi@arangodb.com>
Wed, 6 Jan 2016 20:01:52 +0000 (21:01 +0100)

Trivial merge