ep-mhoellein/learn_git — pull request #5 by ep-aurban (2014-01-20 15:28:33+00:00)
Title: Feature/create merge conflict

Blau machen!