[otb] 09/09: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/otb

[Rashad Kanavath]

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

rashad-guest pushed a commit to branch master
in repository otb.

commit 882a1a78ff2a14eef0234c57d883d3cbc5528ed8
Merge: 9d06c6e cddb5ae
Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Date:   Fri Sep 25 15:22:16 2015 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/otb
    
    Conflicts:
    	debian/copyright

 debian/control   | 2 +-
 debian/copyright | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git