[openmeca] 04/04: Merge tag 'upstream/2.2.5'

[Damien André]

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

damien-andre-guest pushed a commit to branch master
in repository openmeca.

commit dc8cbb63840ecc7b59ca6ca1c9f3a848e0a0a050
Merge: cd06e56 754e2f8
Author: Damien André <damien.andre at unilim.fr>
Date:   Tue Apr 25 12:13:38 2017 +0200

    Merge tag 'upstream/2.2.5'
    
    Upstream version 2.2.5


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