The neutral two-locus model in population genetics is reformulated as a measure-valued diffusion process and is shown under certain conditions to have a unique stationary distribution and be weakly ergodic. The limits of the process and its stationary distribution as the recombination parameter tends to infinity are found. Genealogies are incorporated into the model, and it is shown that a random sample of size n from the population at stationarity has a common ancestor.