Branch: refs/heads/master Home: https://github.com/seam/servlet Commit: 36088b909ee445130bcd55cd348c17082d20f124 https://github.com/seam/servlet/commit/36088b909ee445130bcd55cd348c17082d... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-01-28 (Fri, 28 Jan 2011) Changed paths: M impl/src/main/java/org/jboss/seam/servlet/log/ServletLog.java Log Message: ----------- use solder logging classes Commit: f5bafac182d2ebfbac2e6d03a531ecc646e2382c https://github.com/seam/servlet/commit/f5bafac182d2ebfbac2e6d03a531ecc646... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-01-31 (Mon, 31 Jan 2011) Changed paths: M .gitignore M impl/pom.xml M impl/src/main/java/org/jboss/seam/servlet/ServletExtension.java M impl/src/main/java/org/jboss/seam/servlet/log/ServletLog.java M impl/src/main/java/org/jboss/seam/servlet/messages/ServletMessages.java M impl/src/test/java/org/jboss/seam/servlet/test/util/Deployments.java M pom.xml Log Message: ----------- Merge remote branch 'origin/master' Conflicts: impl/src/main/java/org/jboss/seam/servlet/log/ServletLog.java