[pyfr] 01/32: Merge branch 'release/v1.3.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 23c45c3e035f319495259108f711dde6fedfb68d
Merge: 2d54d57 2f1a41f
Author: Freddie Witherden <freddie at witherden.org>
Date:   Mon Jan 11 17:19:15 2016 +0000

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

 doc/src/conf.py        |  4 ++--
 doc/src/user_guide.rst | 27 ++++++++++++++++++++++++++-
 pyfr/_version.py       |  2 +-
 setup.py               |  2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)

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