[Merge] lp:~jderose/ubuntu/saucy/couchdb/1.4.0 into lp:ubuntu/couchdb

[Jason Gerard DeRose]

Oh, one more thing, something about UDD or quilt caused two conflicts when you try to merge this into lp:ubuntu/saucy/couchdb:

conflicts:
  Text conflict in bin/couchdb.tpl.in
  Text conflict in etc/init/couchdb.tpl.in

They can be correctly resolved with:

bzr resolve --all --take-other
-- 
https://code.launchpad.net/~jderose/ubuntu/saucy/couchdb/1.4.0/+merge/182725
Your team Ubuntu branches is requested to review the proposed merge of lp:~jderose/ubuntu/saucy/couchdb/1.4.0 into lp:ubuntu/couchdb.