Renamed Copy/Cut/Paste, improved tooltip, see trac #11881
Added missing comment for setTransferLinks() method
Add undefinied ICE_HOME variable for Ice 3.4
Renamed 'Unlink' tag options into 'Remove', see trac #11884
Try to fix 'omename' not found in robotframework webadmin
Updated copyrights to include 2014
Merge pull request #2129 from sbesson/homebrew_backport

Homebrew backport
Unify command-line importer help

- Use OMERO username and OMERO password
- Capitalize ID across the board
Group all Java arguments into a group for parsing clarity

- Also use METAVAR for annotation key/value pairs
Improve readability of importer-cli usage() method
merge dev_5_0 -D org -I include -E exclude: PR 2086 (Record PersistentEventLogLoader event ID to file (see #11948))
merge dev_5_0 -D org -I include -E exclude: PR 2108 (release-src includes bioformats version metadata)
merge dev_5_0 -D org -I include -E exclude: PR 2116 (Inplace import icon dev 5 0, 11970)
merge dev_5_0 -D org -I include -E exclude: PR 2124 (Update dev_5_0 submodules)
merge dev_5_0 -D org -I include -E exclude: PR 2130 (Try to fix 'omename' not found in robotframework webadmin)
merge dev_5_0 -D org -I include -E exclude: PR 2133 (Renamed Cut,Copy,Paste,Unlink options (see trac #11880))
merge dev_5_0 -D org -I include -E exclude: PR 2134 (Unify command-line importer help)
merge dev_5_0 -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Merged PRs:
  # PR 2086 jballanc 'Record PersistentEventLogLoader event ID to file (see #11948)'
  # PR 2108 rleigh-dundee 'release-src includes bioformats version metadata'
  # PR 2116 dominikl 'Inplace import icon dev 5 0, 11970'
  # PR 2124 snoopycrimecop 'Update dev_5_0 submodules'
  # PR 2130 will-moore 'Try to fix 'omename' not found in robotframework webadmin'
  # PR 2133 dominikl 'Renamed Cut,Copy,Paste,Unlink options (see trac #11880)'
  # PR 2134 sbesson 'Unify command-line importer help'

Repository: openmicroscopy/bioformats
Updating 7e757e5..010910b
Merged PRs (fast-forward):
  # PR 947 hflynn 'Updating Aperio ImageScope weblink'

Merged PRs:
  # PR 915 imunro 'Fix for single channel  meas_mode 13 data.'
  # PR 941 melissalinkert 'Fix the download URL for stable release jars'
  # PR 943 melissalinkert 'Log the expected and actual values in failed metadata tests'
  # PR 946 melissalinkert 'Read internal pyramids from CellSens .vsi data'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Updating b1edac6..f8335b5
Merged PRs (fast-forward):
  # PR 677 sbesson 'Document Homebrew formula upgrade to 5.0.0'

Merged PRs:
  # PR 678 bpindelski 'Update OMERO.grid doc'
  # PR 679 hflynn 'Suggested mailing list note update'
  # PR 680 jballanc 'Updated section on search re-indexing (see #11995)'

Generated by OMERO-5.0-merge-daily#596 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/596/)