laura.gassner authored Mar 02, 2016 and Florian Wittkamp committed Mar 11, 2016

# Conflicts:
#	src/IFOS2D.c
#	src/wavelet.c