[pyfr] 12/88: Merge branch 'release/v1.4.0' into develop.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository pyfr.

commit 13c9289ac6389255dc735dad4c19de33538f4516
Merge: 4f0494a d037592
Author: Freddie Witherden <freddie at witherden.org>
Date:   Wed Apr 20 10:06:28 2016 -0700

    Merge branch 'release/v1.4.0' into develop.

 doc/src/conf.py        |  4 ++--
 doc/src/home.rst       |  5 +++--
 doc/src/user_guide.rst |  2 +-
 pyfr/_version.py       |  2 +-
 pyfr/shapes.py         | 16 +++-------------
 5 files changed, 10 insertions(+), 19 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfr.git