zenphoto/zenphoto — pull request #94 by sbillard (2012-11-05 23:52:13+00:00)
Title: Try again.

GitHub is not so friendly with changes that "might" be in conflict.