[teiid-commits] [teiid/teiid] f7a8a2: pushing changes upstream into the project

[Van Halbert]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: f7a8a2aebb951fbe7436081de8ca464e745ae601
      https://github.com/teiid/teiid/commit/f7a8a2aebb951fbe7436081de8ca464e745ae601
  Author: Van Halbert <vhalbert at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/bin/scripts/teiid-standalone-mode-install.cli

  Log Message:
  -----------
  pushing changes upstream into the project

Conflicts:

	build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli