ModeShape/modeshape — pull request #618 by rhauch (2012-12-05 23:05:53+00:00)
Title: MODE-1513 Merge 'federation' branch onto 'master'

Only a few minor conflicts needed to be resolved.