a
a
test1
Merge branch 'test1' into develop

Conflicts:
	src/main/java/org/graylog2/CommandLineArguments.java
test prerebase
test1
test2
Merge branch 'test2' into develop
a
test2 commit
test1 commit
Merge branch 'test1' into develop