[pyfr] 68/88: Merge branch 'develop' into feature/shocks.

[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 8f44bd03f811f4cdeb83a019cc1f26e329affeaf
Merge: 37585d3 be98b48
Author: Freddie Witherden <freddie at witherden.org>
Date:   Sat Jul 23 14:41:52 2016 -0700

    Merge branch 'develop' into feature/shocks.

 pyfr/integrators/dual/steppers.py | 7 +++----
 pyfr/plugins/base.py              | 2 +-
 pyfr/plugins/fluidforce.py        | 2 +-
 pyfr/readers/native.py            | 3 +++
 4 files changed, 8 insertions(+), 6 deletions(-)

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