[seam-commits] [seam/solder] d624a4: Merge branch 'master' of https://github.com/mgencu...

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/seam/solder

Commit: d624a436ad929b6c1af71fb8118b92f898fa1e52
    https://github.com/seam/solder/commit/d624a436ad929b6c1af71fb8118b92f898fa1e52
Author: Shane Bryzak <sbryzak at gmail.com>
Date:   2011-03-11 (Fri, 11 Mar 2011)

Changed paths:
  M impl/pom.xml
  M pom.xml

Log Message:
-----------
Merge branch 'master' of https://github.com/mgencur/solder into mgencur-master

Conflicts:
	pom.xml


Commit: 182275ba42e56dc9f45c7c521eb6a8ded84aa4d9
    https://github.com/seam/solder/commit/182275ba42e56dc9f45c7c521eb6a8ded84aa4d9
Author: Shane Bryzak <sbryzak at gmail.com>
Date:   2011-03-11 (Fri, 11 Mar 2011)

Changed paths:
  M .gitignore
  A api/src/main/java/org/jboss/seam/solder/core/SeamManaged.java
  M impl/src/main/java/org/jboss/seam/solder/core/CoreExtension.java

Log Message:
-----------
Merge remote branch 'upstream/master'


Compare: https://github.com/seam/solder/compare/b3d7069...182275b