commit c21e1556670c9c8fec84c55aa24c0607ad26c4ed
Merge: 056164f 37b2af1
Author: Alexander Lehmann <alexl...@gmail.com>
AuthorDate: Wed Feb 29 14:07:20 2012 +0100
Commit: Alexander Lehmann <alexl...@gmail.com>
CommitDate: Wed Feb 29 14:07:20 2012 +0100
Merge remote-tracking branch 'upstream/master'
Changed files:
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/AbstractSpringJBehaveIntegrationTest.java
M
examples/spring-security/src/test/resources/stories/authentication/user_flags.story
M examples/spring-security/pom.xml
M examples/spring-security/src/main/resources/applicationContext.xml
A examples/spring-security/src/main/resources/log4j.properties
