Kenneth Lausdahl d4a39699c6 attempting to merge master and au/cli 7 gadi atpakaļ
..
META-INF d4a39699c6 attempting to merge master and au/cli 7 gadi atpakaļ
src d4a39699c6 attempting to merge master and au/cli 7 gadi atpakaļ
build.properties d4a39699c6 attempting to merge master and au/cli 7 gadi atpakaļ
plugin.xml d4a39699c6 attempting to merge master and au/cli 7 gadi atpakaļ
pom.xml d4a39699c6 attempting to merge master and au/cli 7 gadi atpakaļ