Include LDAP OR docs from Jake Carroll
Merge pull request #927 from sbesson/memory_emergency_pr

Fix memory command on server upgrade page
Merge pull request #928 from joshmoore/ldap-OR-clause

Include LDAP OR docs from Jake Carroll
Merge pull request #926 from dpwrussell/rebased/dev_5_0/network_hopper

Documentation for network hopping for developer laptops (rebased onto dev_5_0)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating c1fef5b..6cc998e
Merged PRs (fast-forward):
  # PR 926 dpwrussell 'Documentation for network hopping for developer laptops (rebased onto dev_5_0)'
  # PR 928 joshmoore 'Include LDAP OR docs from Jake Carroll'
  # PR 927 sbesson 'Fix memory command on server upgrade page'

Generated by OME-5.0-merge-push#165 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/165/)