merge dev_5_0 -D org: PR 860 (move %time% template expansion term to only user-owned)
merge dev_5_0 -D org: PR 862 (DropBox note)
merge dev_5_0 -D org: PR 863 (OMERO.server properties: documentation template)
merge dev_5_0 -D org

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

Merged PRs:
  # PR 860 mtbc 'move %time% template expansion term to only user-owned'
  # PR 862 ximenesuk 'DropBox note'
  # PR 863 sbesson 'OMERO.server properties: documentation template'
Generated by OMERO-5.0-merge-push#100 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/100/)