Update memory settings to omero.jvmcfg
Latest config.txt
Update config.txt with File-Size-64
merge dev_5_0 -D org: PR 866 (Document client requirements for in-place import on Windows.)
merge dev_5_0 -D org: PR 868 (5.0.3: CLI documentation)
merge dev_5_0 -D org: PR 870 (New search docs)
merge dev_5_0 -D org: PR 873 (add note about consequences of "damaging" in-place import files)
merge dev_5_0 -D org: PR 875 (Expand setup.py test/py.test options description)
merge dev_5_0 -D org: PR 877 (Update recommended PostgreSQL version to 9.2 for float bug fix)
merge dev_5_0 -D org: PR 881 (Adv config example)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating 53a820a..c6247bb
Merged PRs (fast-forward):
  # PR 862 ximenesuk 'DropBox note'
  # PR 863 sbesson 'OMERO.server properties: documentation template'
  # PR 872 rleigh-dundee 'travis: Switch from raring to saucy'

Merged PRs:
  # PR 866 bpindelski 'Document client requirements for in-place import on Windows.'
  # PR 868 sbesson '5.0.3: CLI documentation'
  # PR 870 joshmoore 'New search docs'
  # PR 873 mtbc 'add note about consequences of "damaging" in-place import files'
  # PR 875 sbesson 'Expand setup.py test/py.test options description'
  # PR 877 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 881 joshmoore 'Adv config example'

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