Add documentation to build.xml for build.py changes (Fix #10254)
build.xml: release-clients blurb
remove  null check.
Forgot to save all changes.
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 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 666 (Matlab toolbox cleanup)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 697 (Fix bug in bulk annotations in web image viewer, support screen annotations)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 708 (Handle the case of unloaded original file (see #10347))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 711 (Modify default Homebrew installation directory to /usr/local)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 716 (Integrate cpp fixtures)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 717 (Download original file)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 721 (Minor comment and string fixes.)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 727 (Add documentation to build.xml for build.py changes (Fix #10254))
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 558 jburel 'Plugin dependencies'
  # 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 666 sbesson 'Matlab toolbox cleanup'
  # PR 697 knabar 'Fix bug in bulk annotations in web image viewer, support screen annotations'
  # PR 708 jburel 'Handle the case of unloaded original file (see #10347)'
  # PR 711 sbesson 'Modify default Homebrew installation directory to /usr/local'
  # PR 716 JesseCorrington 'Integrate cpp fixtures'
  # PR 717 jburel 'Download original file'
  # PR 721 mtbc 'Minor comment and string fixes.'
  # PR 727 joshmoore 'Add documentation to build.xml for build.py changes (Fix #10254)'

Repository: openmicroscopy/bioformats
Updating 3f142f7..7c0f9d5
Merged PRs:
  # PR 368 melissalinkert 'Remove hard dependency on log4j'
  # PR 373 melissalinkert 'Sprint5 bug fixes'
  # PR 376 sbesson 'Logging docfix'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 18 will-moore 'Split view merged 10109'

Repository: openmicroscopy/ome-documentation
Updating 2759d65..5e623e1
Merged PRs:
  # PR 245 mtbc 'Add note about Java UTF-8 source in Insight.'
  # PR 248 sbesson 'Command formatting (see #10213)'

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