802cdfb Merge remote-tracking branch 'origin/master'

Merged and Committed by peter 12 years ago
    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
    	couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
    	couchdb-0006-Fixes-for-system-wide-ibrowse.patch
    	couchdb-0006-Remove-pid-file-after-stop.patch
    	couchdb-0007-Fixes-for-system-wide-ibrowse.patch
    	couchdb-0007-Remove-pid-file-after-stop.patch
    	couchdb-0008-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
    	couchdb-0009-Change-respawn-timeout-to-0.patch
    	couchdb-0009-Fixes-for-system-wide-ibrowse.patch
    	couchdb-0010-Relax-curl-dependency-to-7.15-for-RHEL5.patch
    	couchdb-0010-Remove-pid-file-after-stop.patch
    	couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch
    	couchdb.spec
    
        
file modified
+1 -0
couchdb-0011-Spidermonkey-1.8.5-patch.patch couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch
file renamed
+43 -44
file modified
+15 -37
file modified
+10 -10
file modified
+1 -1