tree d4bc20003f5af90b50de3779b071d546f41251c0
parent 292c64739e56f2da9c990a7d8dd287cb5b54dc9e
parent 4b4ce1fb3c62298c3f7fbbe13035f6675a65a4e9
author Joan Touzet <wohali@atypical.net> 1481150226 -0500
committer Joan Touzet <wohali@atypical.net> 1481150226 -0500

Merge branch 'release/couchdb_2.0'