ipython/ipython — pull request #6206 by minrk (2014-07-24 21:45:38+00:00)
Title: minor tweak to git hooks

- fix PREVIOUS_HEAD when run as git-merge
- catch fab css failure