Fix getLabel() bug from channel_name_tweaks PR
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 538 (OMERO.tables ArrayColumns #5632)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 558 (Plugin dependencies)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 616 (render_fs_speed_10183)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 620 (Spec clean on dev 4 4)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 639 (Web bugs jan22nd)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 647 (xsd-fu cleanup (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 656 (Merge xsd-fu changes from schema-2012-06 (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 662 (Cpu)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 665 (Modify date range.)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 666 (Matlab toolbox cleanup)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 668 (Install scc and merge PRs opened against homebrew-alt)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 677 (Fix getLabel() bug from channel_name_tweaks PR)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 538 manics 'OMERO.tables ArrayColumns #5632'
  # PR 558 jburel 'Plugin dependencies'
  # PR 616 will-moore 'render_fs_speed_10183'
  # PR 620 qidane 'Spec clean on dev 4 4'
  # PR 639 will-moore 'Web bugs jan22nd'
  # PR 647 rleigh-dundee 'xsd-fu cleanup (dev_4_4)'
  # PR 656 rleigh-dundee 'Merge xsd-fu changes from schema-2012-06 (dev_4_4)'
  # PR 662 jburel 'Cpu'
  # PR 665 jburel 'Modify date range.'
  # PR 666 sbesson 'Matlab toolbox cleanup'
  # PR 668 sbesson 'Install scc and merge PRs opened against homebrew-alt'
  # PR 677 will-moore 'Fix getLabel() bug from channel_name_tweaks PR'

Repository: openmicroscopy/bioformats
Updating 03770c0..6bbd9b7

Repository: ome/scripts
Updating 3587c87..f1abf9e
Merged PRs:
  # PR 18 will-moore 'Split view merged 10109'

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..982b908
Merged PRs:
  # PR 224 gusferguson 'Training material'
  # PR 227 joshmoore 'Add sections on locking and remote shares to unix/windows'
  # PR 231 sbesson 'Migrate the VM installation instructions to the Sphinx documentation'
  # PR 234 sbesson 'Homebrew instalation command'

Generated by OMERO-merge-stable#137 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/137/)