Merge remote-tracking branch 'apache/1.1.x'

2011-10-10T18:04:54+00:00

Merge 1.1.x changes

2011-09-28T10:32:50+00:00

Conflicts:
	apps/couch/include/couch_db.hrl
	apps/couch/src/couch_db.erl
	apps/couch/src/couch_os_process.erl
	apps/couch/src/couch_query_servers.erl
	apps/couch/src/couch_rep.erl
	apps/couch/src/couch_replication_manager.erl
	apps/couch/src/couch_view_compactor.erl
	apps/couch/src/couch_view_group.erl
	apps/couch/src/couch_view_updater.erl
	configure.ac
	couchjs/c_src/http.c
	couchjs/c_src/main.c
	couchjs/c_src/utf8.c
	etc/windows/couchdb.iss.tpl
	src/couchdb/priv/Makefile.am
	src/couchdb/priv/couch_js/main.c
	test/etap/160-vhosts.t
	test/etap/200-view-group-no-db-leaks.t
	test/etap/Makefile.am

BugzID: 12645

clear out root folder a bit, moving couch bits into apps/couch or rel/

2010-08-18T21:19:37+00:00

cloudant_bigcouch.git/apps/couch/test/javascript, branch upstream

Merge remote-tracking branch 'apache/1.1.x'

Merge 1.1.x changes

clear out root folder a bit, moving couch bits into apps/couch or rel/