[seam-commits] [seam/parent] ea7ca4: Merge remote branch 'upstream/master'
Branch: refs/heads/master
Home: https://github.com/seam/parent
Commit: ea7ca45cb72f0b64a157d11b82754e2d63ec9697
https://github.com/seam/parent/commit/ea7ca45cb72f0b64a157d11b82754e2d63e...
Author: Shane Bryzak <sbryzak(a)gmail.com>
Date: 2011-01-25 (Tue, 25 Jan 2011)
Changed paths:
M pom.xml
Log Message:
-----------
Merge remote branch 'upstream/master'
Conflicts:
pom.xml