ipython/ipython — pull request #1336 by hhuuggoo (2012-01-28 03:01:20+00:00)
Title: crack at making notebook.html use the layout.html template

Conflicts:

IPython/frontend/html/notebook/templates/notebook.html