[seam-commits] [seam/config] 3ac73c: Merge remote branch 'upstream/master'

[noreply at github.com]

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

Commit: 3ac73ccc4368fcb271ac4e9f1fe7aa6377608dee
    https://github.com/seam/config/commit/3ac73ccc4368fcb271ac4e9f1fe7aa6377608dee
Author: Shane Bryzak <sbryzak at gmail.com>
Date:   2011-01-11 (Tue, 11 Jan 2011)

Changed paths:
  M dist/src/main/assembly/readme.txt
  M examples/princess-rescue/pom.xml
  M examples/princess-rescue/readme.txt

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

Conflicts:
	dist/src/main/assembly/readme.txt