openmicroscopy/openmicroscopy — pull request #1680 by joshmoore (2013-10-29 08:22:06+00:00)
Title: Fix bad merge commit

Unmerged sections of test_thumbnailPerms.py made it in.

/cc @ximenesuk