Revision 984504

Jump to revision:
Author:	nslater
Date:	Wed Aug 11 18:14:39 2010 UTC (13 years, 8 months ago)
Changed paths:	4
Log Message:	merged r984501 from trunk

Changed paths

Path	Details
couchdb/branches/1.0.x/	modified , props changed
couchdb/branches/1.0.x/Makefile.am	modified , text changed
couchdb/branches/1.0.x/etc/couchdb/	modified , props changed
couchdb/branches/1.0.x/etc/default/couchdb	modified , props changed