ipython/ipython — pull request #1299 by hhuuggoo (2012-01-20 14:28:17+00:00)
Title: made notebook.html extend layout.html

Conflicts:

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