IIIF/iiif.io — pull request #248 by azaroth42 (2014-06-27 21:17:26+00:00)
Title: Merge Branches

Merge branches for conflicts