openmicroscopy/ome-documentation — pull request #287 by pwalczysko (2013-03-08 19:26:52+00:00)
Title: Perm table f

The conflict should be fixed now. The typo remarked on by mtbc should be fixed as well.