Strae/Viewer.js — pull request #1 by micheleolivo (2014-02-10 20:55:15+00:00)
Title: Done the rebase for you

I have done the rebase from kogmbh/Viewer.js (master) solving the conflicts as best I can.
You can try to submit this ;)