ipython/ipython — pull request #1355 by hhuuggoo (2012-01-30 23:18:32+00:00)
Title: notebook.html extends layout.html now

Conflicts:

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