[Blends-commit] [SCM] science branch, master, updated. 98863c4732cb75403a8b72a52ef97fe8a1244332

[Ghislain Antony Vaillant]

The following commit has been merged in the master branch:
commit 98863c4732cb75403a8b72a52ef97fe8a1244332
Merge: 820300ec7dfc41dcd24496c6cd4bf311e48c555f 2714193f7fe581b5b76b3a24efc0bb8c62b37668
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Apr 17 13:16:33 2015 +0100

    Merge branch 'master' of ssh://git.debian.org/git/blends/projects/science
    
    Conflicts:
    	tasks/tools

diff --combined tasks/tools
index 6c77162,76dc87e..ab0464c
--- a/tasks/tools
+++ b/tasks/tools
@@@ -15,4 -15,4 +15,6 @@@ Depends: openstereogra
  
  Depends: xoscope
  
+ Suggests: libmemtailor-dev
++
 +Depends: python-h5py | python3-h5py

-- 
Debian Science Blend