merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 33 (Add AlreadyMerged command)
merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 46 (Fail-fast if bad credentials are used)
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

Repository: openmicroscopy/snoopycrimecop
Already up-to-date.
Merged PRs:
  # PR 33 joshmoore 'Add AlreadyMerged command'
  # PR 46 sbesson 'Fail-fast if bad credentials are used'
  # PR 47 joshmoore 'Auto submod updating'

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