Correcting double file extension
merge develop -D org: PR 857 (Initial support for Zeiss .lms files)
merge develop -D org: PR 858 (Initial support for Veeco AFM data)
merge develop -D org: PR 981 (Ignore namespaces when filling in an XMLAnnotation's Value)
merge develop -D org: PR 983 (Woolz: make sure the service is initialized when calling openBytes (rebased onto develop))
merge develop -D org: PR 985 (Updating transform catalog for 2013-10-dev-1)
merge develop -D org: PR 990 (Memoization fixes (rebased onto develop))
merge develop -D org: PR 991 (Only add a MetadataOnly element if no TiffData elements are present)
merge develop -D org: PR 992 (C++: Enable stricter warnings)
merge develop -D org: PR 995 (C++ sphinx documentation)
merge develop -D org: PR 999 (Fix for single channel  meas_mode 13 data (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1001 qidane 'New time docs and samples' (status: error)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 994 melissalinkert 'InCell: fix NPE when parsing Z positions (rebased onto develop)' (status: )
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1002 qidane 'Adding a Map type and MapAnnotation' (exclude comment)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value'
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 985 qidane 'Updating transform catalog for 2013-10-dev-1'
  # PR 990 melissalinkert 'Memoization fixes (rebased onto develop)'
  # PR 991 melissalinkert 'Only add a MetadataOnly element if no TiffData elements are present'
  # PR 992 rleigh-dundee 'C++: Enable stricter warnings'
  # PR 995 rleigh-dundee 'C++ sphinx documentation'
  # PR 999 melissalinkert 'Fix for single channel  meas_mode 13 data (rebased onto develop)'

Generated by OMERO-5.1-merge-push#117 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/117/)