jdfreder/nbconvert — pull request #1 by Carreau (2013-02-23 11:19:57+00:00)
Title: fix issues on rebase

I think you had a few issues with the rebase that modified some files it shouldn't had.

This checkout some files back to their original state.