Should not get any conflicts here.

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@25 a79c6d67-9624-418e-af80-2fa85c78f146
Merge github.com:bogdanneacsa/svn-ssh-demo into HEAD

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@26 a79c6d67-9624-418e-af80-2fa85c78f146