Commit Graph

3 Commits

Author SHA1 Message Date
a519acdac0 Merge branch 'master' of gitorious.psi.ch:pmodules/src
Conflicts:
	scripts/Bootstrap/Pmodules/libpmodules.bash
	scripts/Bootstrap/Pmodules/modmanage.in
2015-04-13 15:35:25 +02:00
0296400ffa Merged with newest version of Achim 2015-03-13 09:39:53 +01:00
6c8e2c9fa9 lib/libem.bash: bugfixes 2015-02-27 22:47:20 +01:00