test for samma
Merge branch 'master' of github.com:thyphoon/test

# By Matthias Richter
# Via Matthias Richter
* 'master' of github.com:thyphoon/test: (46 commits)
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  test commit2
  ...

Conflicts:
	do_something.txt