Merge branch 'master' into gui
Merge branch 'master' into gui
Merge remote branch 'inge/gui' into gui
Merge remote branch 'inge/gui' into gui
Merge remote branch 'inge/gui' into gui
Merge remote branch 'inge/gui' into gui
Added quoting of argument directory for git-commit.sh
WhiteSpace changes - to trigger build
Merged master into GUI branch
Merged in status from inge
Fixed dangling merge conflict
Added (failing) gui_test.py
Merge pull request #4 from joakim-hove/gui-test

Added (failing) gui_test.py