Merge branch 'master' of gitorious.psi.ch:pmodules/src
Conflicts: scripts/Bootstrap/Pmodules/libpmodules.bash scripts/Bootstrap/Pmodules/modmanage.in
Showing
Conflicts: scripts/Bootstrap/Pmodules/libpmodules.bash scripts/Bootstrap/Pmodules/modmanage.in