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