tree e5993770e6cfc8a6d2476d440d31733f45f25317
parent 03451da61ceb390805861e6bb50aea3904d4ff28
parent 32047971353f8a7a9e27d874c49deaa51f22d8de
author Adam Kocoloski <adam@cloudant.com> 1276187113 -0400
committer Adam Kocoloski <adam@cloudant.com> 1276187113 -0400

Merge branch 'mem3'

Conflicts:
	apps/couch/src/couch_btree.erl
	apps/couch/src/couch_changes.erl
	apps/couch/src/couch_db.erl
	apps/couch/src/couch_db.hrl
	apps/couch/src/couch_httpd_db.erl
	apps/couch/src/couch_util.erl
	apps/dynomite/ebin/dynomite.app
	apps/dynomite/src/dynomite_couch_api.erl
	apps/rexi/ebin/rexi.app
	apps/rexi/src/rexi.erl
	apps/rexi/src/rexi_server.erl
	apps/showroom/src/showroom_db.erl
	apps/showroom/src/showroom_sup.erl
	apps/showroom/src/showroom_view_updater.erl