Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <willi@arangodb.com>
Sun, 11 Oct 2015 11:57:27 +0000 (13:57 +0200)
committerWilfried Goesgens <willi@arangodb.com>
Sun, 11 Oct 2015 11:57:27 +0000 (13:57 +0200)
1  2 
webcit/subst.c

diff --cc webcit/subst.c
Simple merge