tree a25c15d87c76cb5af6a63eb9cf7b58570c905cbd
parent c125e039ec08ae2ead8523eae38204d199688bba
parent 724e782aabc2537b32f9708e5e3a851e3d4c8c1e
author Andy Wenk <andywenk@apache.org> 1412376085 +0200
committer Andy Wenk <andywenk@apache.org> 1412376085 +0200

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/couchdb-admin