Phillip Webb 0174476ff1 Merge branch '1.1.x' into 1.2.x		2015-03-02 12:12:57 -08:00
..
src/main/resources/META-INF	Add a logging system, starter and sample for Log4j 2	2014-10-08 15:30:00 +01:00
pom.xml	Next development version	2015-02-26 15:26:53 -08:00