Metaswitch/sprout — pull request #811 by eleanor-merry (2014-10-09 09:14:21+00:00)
Title: [No reviewer] Merge from jmmL fork

Merging pull request from jmmL to manage merge conflicts