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 49 (Check for proper "github" module)
merge master -D org -I include -E conflict -E needs-fixes -E broken: PR 50 (Handle KeyboardInterrupt on "Enter password")
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

Repository: openmicroscopy/snoopycrimecop
Already up-to-date.
Merged PRs:
  # PR 47 joshmoore 'Auto submod updating'
  # PR 49 sbesson 'Check for proper "github" module'
  # PR 50 sbesson 'Handle KeyboardInterrupt on "Enter password"'
  # PR 52 sbesson 'Filter improvement'

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