Branch: refs/heads/develop Home: https://github.com/seam/social Commit: d0fa58aefc525eebe22d7f2ab4c29d3a9fe29663 https://github.com/seam/social/commit/d0fa58aefc525eebe22d7f2ab4c29d3a9fe... Author: Marek Schmidt <maschmid(a)redhat.com&gt; Date: 2011-06-01 (Wed, 01 Jun 2011) Changed paths: M impl/pom.xml Log Message: ----------- fix the versions of jboss-as-client and jboss-server-manager Commit: a2de43797c3b1d6cd436d6c62c2ca19a49f7d9e4 https://github.com/seam/social/commit/a2de43797c3b1d6cd436d6c62c2ca19a49f... Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net&gt; Date: 2011-06-02 (Thu, 02 Jun 2011) Changed paths: M impl/pom.xml M impl/src/test/java/org/jboss/seam/social/test/TwitterTest.java Log Message: ----------- Merge branch 'arqhelp' of git://github.com/maschmid/social into develop Conflicts: impl/src/test/java/org/jboss/seam/social/test/TwitterTest.java Compare: https://github.com/seam/social/compare/6ce2fa3...a2de437