[teiid-commits] [teiid/teiid] f3e4fc: Merge branch 'rebasePomChanges' of https://github....

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: f3e4fc9a2bc89daa54e7565a59763b4a695bae0b
      https://github.com/teiid/teiid/commit/f3e4fc9a2bc89daa54e7565a59763b4a695bae0b
  Author: shawkins <shawkins at redhat.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M connectors/translator-object/pom.xml
    M pom.xml

  Log Message:
  -----------
  Merge branch 'rebasePomChanges' of https://github.com/vhalbert/teiid
into 8.4.x

Conflicts:
	connectors/translator-object/pom.xml
	pom.xml

Conflicts:

	connectors/translator-object/pom.xml
	pom.xml