ant: Use ant-contrib jar directly
omero: Remove Ice 3.3 and make 3.4 the minimum, 3.5 the default
sysadmins: Update diagnostics to use current versions
windows: Update server diagnostics
windows: Remove stray "JDK6"
troubleshooting: Replace Ice 3.3 reference
developers: Refer to current ZeroC documentation
sysadmins: Deprecate Ice 3.3 for 5.0
Rephrasing CONTRIBUTING re: branch for PRs
Making API doc links point at release version
Merge pull request #762 from rleigh-dundee/ant-makewrap-dev50

Delegate all Makefile targets to ant
ant: Default all properties and handle empty vars in conf.py
merge dev_5_0 -D org: PR 763 (Deprecate Ice 3.3 and note its removal for 5.1)
merge dev_5_0 -D org: PR 764 (Rephrasing CONTRIBUTING re: branch for PRs)
merge dev_5_0 -D org: PR 765 (Making API doc links point at release version)
merge dev_5_0 -D org: PR 767 (ant: Default all properties and handle empty vars in conf.py)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating 036c324..3332c0e
Merged PRs (fast-forward):
  # PR 762 rleigh-dundee 'Delegate all Makefile targets to ant'
  # PR 757 hflynn 'ticket 10030 fix - contributing file for docs repo'
  # PR 749 hflynn 'Adding API doc links to OMERO docs front page'
  # PR 756 rleigh-dundee 'Search.txt: Correct use of unicode quotes'
  # PR 753 rleigh-dundee 'ant: Support API doc generation'

Merged PRs:
  # PR 763 rleigh-dundee 'Deprecate Ice 3.3 and note its removal for 5.1'
  # PR 764 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs'
  # PR 765 hflynn 'Making API doc links point at release version'
  # PR 767 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'

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