summaryrefslogtreecommitdiff
path: root/apps/couch/test/etap/060-kt-merging.t
AgeCommit message (Expand)Author
2011-06-22Merge remote-tracking branch 'upstream/1.1.x' into 0.4.xRobert Newson
2011-01-20Merge CouchDB 1.0.2 release candidateAdam Kocoloski
2010-08-18clear out root folder a bit, moving couch bits into apps/couch or rel/Brad Anderson