tree 2bd0c4e7cc16073b0c1aa19bebd1901df455c423
parent 99b67284dbb90a2f980060e734c10528314e813d
parent fc547a0e9b8e751886e9b2f43988c2e2bce50120
author Robert Newson <rnewson@apache.org> 1398161119 +0100
committer Robert Newson <rnewson@apache.org> 1398161119 +0100

Merge remote-tracking branch 'upstream/master' into 1843-feature-bigcouch

Conflicts:
	src/config.erl