One more test.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2139 71f96598-fa45-0410-b640-bcd6f8691b32
Test commit
Merge branch 'dev-branch' of github.com:mastacontrola/fogproject into dev-branch
Merge svn with master
Merge dev-branch with master