melissalinkert/bioformats — pull request #3 by sbesson (2012-04-10 13:39:47+00:00)
Title: Solve merge conflict

Merge origin/develop into upgrade_check and solve conflicting bfopen.m