merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 47 (Auto submod updating)
merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 52 (Filter improvement)
merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 55 (Add --continue option to rebase)
merge master -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/snoopycrimecop
Already up-to-date.
Merged PRs:
  # PR 47 joshmoore 'Auto submod updating'
  # PR 52 sbesson 'Filter improvement'
  # PR 55 joshmoore 'Add --continue option to rebase'

Generated by SCC-merge#127 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/127/)