first commit

	new file:   README.md
Added distro starter files. Removed .git directory included here by default.

  Files here were generated with this command:

   php drupal-distro.phar new \
     --profile-name="Minimal CI" \
     --profile-description="Core minimal install with basic setup for use with Travis CI" \
     --git-url="https://github.com/bryanhirsch/minimal_ci.git" \
     minimal_ci

   At the time this ^^ command was run, there was a single default branch named
   master. HEAD pointed here: e395b6bd7eadd2db07f2f08e4dfcd6518f458409.

  More info here: https://github.com/cpliakas/drupal-distro

	new file:   .editorconfig
	new file:   .gitignore
	new file:   .travis.yml
	new file:   behat.yml
	new file:   build-minimal_ci.make
	new file:   build.properties.dist
	new file:   build.xml
	new file:   drupal-org-core.make
	new file:   drupal-org.make
	new file:   minimal_ci.info
	new file:   minimal_ci.install
	new file:   minimal_ci.profile
	new file:   test/features/bootstrap/FeatureContext.php
	new file:   test/features/test.feature
Changed basic profile to use core's minimal profile installer.

  This profile is intended to be exactly like core's minimal profile with CI
  setup added in.

	modified:   minimal_ci.info
	modified:   minimal_ci.install
	modified:   minimal_ci.profile
	new file:   translations/README.txt
Added Travis CI build status.

	modified:   README.md
Updated build file. Included make files should an associative array (have names).

	modified:   projects/minimal_ci/build-minimal_ci.make
Added symlinks for drush site-make to be able to rebuild an instance of a site.

	modified:   .gitignore
	typechange: docroot/.htaccess
	new file:   docroot/profiles/minimal_ci
	deleted:    docroot/profiles/minimal_ci/README.md
	deleted:    docroot/profiles/minimal_ci/minimal_ci.info
	deleted:    docroot/profiles/minimal_ci/minimal_ci.install
	deleted:    docroot/profiles/minimal_ci/minimal_ci.profile
	deleted:    docroot/profiles/minimal_ci/translations/README.txt
	typechange: docroot/robots.txt
	new file:   docroot/sites/default
	new file:   drupal-org-core.make
	new file:   drupal-org.make
	new file:   mysite.config.inc
	renamed:    docroot/.htaccess -> symlink-these/.htaccess
	renamed:    docroot/sites/default/default.settings.php -> symlink-these/default/default.settings.php
	new file:   symlink-these/default/files/.htaccess
	new file:   symlink-these/default/settings.php
	renamed:    docroot/robots.txt -> symlink-these/robots.txt
Merge commit 'da742f11c3b6d2a266c822f921cb75640e055337'

Conflicts:
	projects/minimal_ci/build-minimal_ci.make
Remove subtree. Stale (history changed upstream). Needs to be re-added.

 	deleted:    projects/minimal_ci/
Add 'projects/minimal_ci/' from commit 'da742f11c3b6d2a266c822f921cb75640e055337'

git-subtree-dir: projects/minimal_ci
git-subtree-mainline: f6cd4f2f2c6c8ae80c116b049bced12d45825862
git-subtree-split: da742f11c3b6d2a266c822f921cb75640e055337
Changed includes to be an associative array, per gotcha documented in README.

	modified:   build-minimal_ci.make
Added proper YAML-based config. Removed PHP-based config.

	deleted:    mysite.config.inc
	new file:   mysite.config.yml
Changed build.xml to use build.make.

  This enables site instances to create wrappers around a distro's make file and
  not create confusing name-space collisions. If you want to use someone else's
  make, just symlink it.

	modified:   build.xml
Updated site-specific make file to avoid confusion.

	renamed:    build-minimal_ci.make -> build.make
	modified:   README.md
	modified:   mysite.config.yml
Revert "Changed build.xml to use build.make."

This reverts commit 405512793b1c11be26641415c10108ebf839f540.
Updated build.properties. Overrride build.xml, use build.make for make file.

	modified:   build.properties