tree b70fa2b4cde5e390ad49115da58dfae15646d165
parent e285b34a7b7156c3fae8ddc4594981f57e265dc4
parent d52a5335d930d11ade4953c8576d22f55872ff6f
author Nick Vatamaniuc <vatamane@apache.org> 1485877967 -0500
committer Nick Vatamaniuc <vatamane@apache.org> 1485877967 -0500

Merge branch 'couchdb-3284'

closes #223