Make the copyright date the current year
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 218 (Make the copyright date the current year (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 218 bpindelski 'Make the copyright date the current year (rebased onto develop)'

Generated by SCC-merge#119 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/119/)