[ignition-math2] 01/03: Merge branch 'upstream'

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch master
in repository ignition-math2.

commit 28e87ca1c0c580bdb78b797292a2dad4c2a722fd
Merge: 0b7fc05 3aca95d
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Aug 25 00:55:37 2015 +0000

    Merge branch 'upstream'


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