Fix source code links moved to the scifio-tools foder
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 368 (Remove hard dependency on log4j)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 373 (Sprint5 bug fixes)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 376 (Logging docfix)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 3f142f7..7c0f9d5
Merged PRs:
  # PR 368 melissalinkert 'Remove hard dependency on log4j'
  # PR 373 melissalinkert 'Sprint5 bug fixes'
  # PR 376 sbesson 'Logging docfix'

Generated by OMERO-merge-stable#157 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/157/)