[hdf-compass] 262/295: Merge branch 'ticket_118' of https://github.com/giumas/hdf-compass into ticket_118

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.

commit 0f8e98b9ef8cc7b2db8664f72b10579804ba4124
Merge: 73dd991 af5f1df
Author: giumas <giumas at yahoo.it>
Date:   Tue Nov 17 10:04:46 2015 -0500

    Merge branch 'ticket_118' of https://github.com/giumas/hdf-compass into ticket_118
    
    # Conflicts:
    #	README.rst
    #	hdf_compass/bag_model/model.py

 hdf_compass/bag_model/model.py | 3 ---
 1 file changed, 3 deletions(-)

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