20131004
Merge branch 'master' of github.com:AttufliX/ipython