Squashed merge from upstream/master to master

commit 49e110a20a005cf0a4ba7ffc76174d8f06f32ae6
Merge: 95efc8c 5694a49
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Nov 5 13:03:06 2014 -0800

    Merge pull request #112 from totten/master-setupsh-multisite

    setup.sh - Fix DBNAME detection in multisite

commit 5694a4929f7a661a31953909fabd84a56437fd8d
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Nov 5 21:00:42 2014 +0000

    setup.sh - Fix DBNAME detection in multisite

commit 95efc8cef5191fc477bdec021b762bcd22c4ef2f
Merge: 5478d8a b72cb4f
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Nov 3 11:27:28 2014 -0800

    Merge pull request #111 from totten/master-dist-readme2

    bin/cividist - Tweak prose

commit b72cb4ffdd8b58d7ce2c817e6fe0f34042c54b28
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Nov 3 11:26:46 2014 -0800

    bin/cividist - Tweak prose

commit 5478d8af6f70a1a1e914607a48db217131e32d5e
Merge: 6a75155 aa9f5ab
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Nov 3 11:19:17 2014 -0800

    Merge pull request #110 from totten/master-dist-readme

    bin/cividist - Generate README.html and .htaccess

commit aa9f5ab8d1727388bcddc7a8d05ecdcd6618a4ec
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Nov 3 11:18:03 2014 -0800

    src/views/show-index.php - Include timezone in timestamp output

commit 88ca83be25565a1bf84b7999ffe0d9c76d2c52cb
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Nov 3 11:17:34 2014 -0800

    bin/cividist - Generate README.html and .htaccess

commit 6a751554c91fdda56375cfdd854a3ea7a7e92045
Merge: 6b9c4de 8065ac5
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Nov 2 15:20:45 2014 -0800

    Merge pull request #109 from totten/master-dist-distregmv

    bin/cividist - Use standard version numbers, but rename files to superficially indicate build-date.

commit 8065ac52873dc5b23af50d582424f209f59ee434
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Nov 2 15:19:13 2014 -0800

    bin/cividist - Bump HASH_SUFIX

commit bb3f9c65671f2dfaa8c3f7cc8c756a53af8335f2
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Nov 2 15:18:23 2014 -0800

    bin/cividist - Fix behavior when build aborts (e.g. Ctrl-C) and reruns

commit 4519439b0b435d5dd5d08bb88bceefab4dc0f138
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Nov 2 14:54:38 2014 -0800

    bin/cividist - Comment

commit 7666709e436fc8b3e7ff96a4a7bc6c4f45c03fca
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Nov 2 14:50:31 2014 -0800

    bin/cividist - Use standard version numbers, but rename files to superficially indicate build-date.

commit 7344233e55efcd6384ddf01f9ccc78b63194a275
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Nov 2 14:49:55 2014 -0800

    bin/regmv - Add a simple script for renaming files using regex

commit 6b9c4de1ce6568a68efa401aac46f5ac64ebe37f
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Oct 28 23:09:40 2014 -0700

    Update README.md

commit e997ae9aebe83bd53fdbc6863c2e1562b96ffb45
Merge: 7cee5e6 3e8fbae
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Oct 28 14:52:44 2014 -0700

    Merge pull request #108 from totten/master-dist-joomla

    app/config/dist - Fix generation of Joomla tarballs

commit 3e8fbae776c2b969b51ac56e7a61d0522a52d008
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Oct 28 14:50:46 2014 -0700

    cividist - Allow regenerating tarballs when the dist script changes

commit a32472bd58b428c510dfbafd2afbbaf634c7132b
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Oct 28 14:26:32 2014 -0700

    app/config/dist - Fix generation of Joomla tarballs

commit 7cee5e65cc97545b24908bd113233d21cf127884
Merge: f9a5b9b 75e6490
Author: Kurund Jalmi <kurund@civicrm.org>
Date:   Tue Oct 28 16:31:24 2014 -0400

    Merge pull request #107 from kurund/add-cividiscount

    add cividiscount

commit 75e64907e423fd71df622903fd5bfce346cd4b78
Author: kurund <kurund@civicrm.org>
Date:   Tue Oct 28 16:07:45 2014 -0400

    add cividiscount

commit f9a5b9b8d8a71b0315dfa95c88e226152362bbfe
Merge: 834ae70 e8ad055
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Oct 28 00:19:11 2014 -0700

    Merge pull request #106 from totten/master-drush-roles

    drupal-demo - Boost performance of granting/revoking permissions

commit e8ad0557f8538cd945d6506ddcd0c610116ec3bb
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Oct 27 23:56:01 2014 -0700

    drupal-demo - Boost performance of granting/revoking permissions

commit 834ae705e6edaa945c9f92c15073294f78d40ff4
Merge: 270c8c6 506969d
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Oct 27 20:02:54 2014 -0700

    Merge pull request #104 from totten/master-civisualize-44fix

    drupal-demo - Fix for install civisualize on d44

commit 506969da47038e0c7c7c4eb0dc51b1dfc8e09a22
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Oct 27 20:02:03 2014 -0700

    drupal-demo - Fix for install civisualize on d44

commit 270c8c608fba0e1635edea5cac10aed74f9302d9
Merge: 4ccb36f 39e9015
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Oct 27 19:12:35 2014 -0700

    Merge pull request #103 from tttp/civisualize

    add civisualize as enabled extension

commit 39e901594fd5bb362da592fbabd8247b5b21965c
Author: xavier <xavier@tttp.eu>
Date:   Mon Oct 27 18:46:49 2014 -0700

    add civisualize as enabled extension

commit 4ccb36f1c691c33017f623aaa83373c97953e613
Merge: 881b55d 98ace11
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 21:30:09 2014 -0700

    Merge pull request #102 from totten/master-para-templates

    INFRA-124 - Use separate templates_c folders for concurrent test threads

commit 98ace11c492cfa974d13348bfbe98d22e577b856
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 21:27:53 2014 -0700

    INFRA-124 - Use separate templates_c folders for concurrent test threads

commit 881b55d66b24a60e17efb76a8a5c17d4c969c4ac
Merge: 6006174 df99c0e
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 17:28:37 2014 -0700

    Merge pull request #101 from totten/master-cividist-debug

    cividist - Use single givi. Remove debug code.

commit 60061741b1047ff52191c06996ceb4c54d8bfb7f
Merge: 8cf701d 60e459d
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 17:22:28 2014 -0700

    Merge pull request #100 from totten/master-l10n-dl

    INFRA-115, #96 - Download l10n tarballs instead of using SVN

commit 60e459d000015bfd1ebec50bc27abe64cce3b792
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 19:23:42 2014 -0400

    civi-download-tools - Remove svn as hard dependency. None of the built-types depend on it.

commit 258e93e63a231f017cfe5911463e5e289fc75952
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 19:22:48 2014 -0400

    app/config/*/drush.make.tmpl - l10n - Change SVN example to tarball example

commit 55f9d6a1f130fdc6203ed093c91a189ba23ec21b
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 19:15:06 2014 -0400

    app/config/caches.sh - Don't initialize l10n cache by default

commit 89243279cbb251fca08bebd86346a5b565475615
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 19:12:47 2014 -0400

    app/config/dist - Init l10n using tarball. Cache tarball (ttl=24hr).

commit cbda9d946e520a8d98e96531d20a43f2bd0dda40
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 19:12:19 2014 -0400

    cividist - Update "l10n" using tarball

commit cdeb41132fcf85187d51e4f0e2b20c88694fcb73
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 17:59:03 2014 -0400

    drupal-demo - Download l10n tarballs instead of svn (#96).

    The SVN data is out-of-date and creates an extra dependency.

commit 8cf701d471c7cceb658d8a71759320ff8349ed72
Merge: d494760 59d892a
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 14:49:06 2014 -0700

    Merge pull request #99 from totten/master-xmlcleanup

    phpunit-xml-cleanup - More aggressive cleaning of messages with \1.

commit 59d892a2a723b9f723a47058d29a34d812d64249
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 26 17:42:34 2014 -0400

    phpunit-xml-cleanup - More aggressive cleaning of messages with \1.

commit d494760d0e214bf629f17c4f49e55da29b3de1a5
Author: colemanw <coleman@civicrm.org>
Date:   Thu Oct 23 10:57:16 2014 -0400

    Add module dependency

commit 6d425fd0698141d9b4130dda62f6bce31cdd6a82
Author: colemanw <coleman@civicrm.org>
Date:   Wed Oct 22 11:36:47 2014 -0400

    Update contrib module versions

commit b328c23a4e7b2229db72de1e796ca27b50f427e5
Merge: e7bb0d6 65e8df2
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Oct 21 15:18:01 2014 -0700

    Merge pull request #97 from colemanw/master

    Disable overlay module

commit 65e8df25c579efa85a7b81cf080a00dd383e7393
Author: colemanw <coleman@civicrm.org>
Date:   Tue Oct 21 17:53:44 2014 -0400

    Disable overlay module

commit d5fea128228a19e851e89f27e68d684524758409
Author: colemanw <coleman@civicrm.org>
Date:   Tue Oct 21 17:52:39 2014 -0400

    Disable overlay module

commit e7bb0d68407d22cb3fda49d67cf2878e4698e36e
Author: colemanw <coleman@civicrm.org>
Date:   Sat Oct 18 19:47:52 2014 -0400

    Update README.md

    I wouldn't call this "experimental" anymore.

commit d7825fb2e8a6c2cf55d3794554f2a77aa114a303
Author: colemanw <coleman@civicrm.org>
Date:   Sat Oct 18 19:47:03 2014 -0400

    Update README.md

commit df99c0e081a47c8485c566a09eba8a7087436d41
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 16:31:26 2014 -0700

    bin/cividist - Use one version of givi (instead of adapting to diff branches)

commit 4563d61794b9fd06aa046e12b486206a6e7bdaad
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 16:30:51 2014 -0700

    bin/givi - Generate error if checkout fails

commit 8814f43e654ec9a9079053c771572eda036e0f1b
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 16:29:55 2014 -0700

    bin/givi - Import

commit 566b064c13184cce6399ea8cbc9920e375f83314
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 16:28:44 2014 -0700

    cividist - Remove debug code

commit fb6e0a2b1b05099cf8accabe1fd608f38dbdc642
Merge: a0137ef bb9d0d5
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 15:57:34 2014 -0700

    Merge pull request #95 from totten/master-auto-dist

    app/config/dist - Add support for building/pruning a pool of nightly tarballs

commit bb9d0d55b428657f95b6c56f59aca129206b31c4
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 15:19:09 2014 -0700

    composer.json - Update git-scan

commit e85130539a4e0d353dac5b6321a6447ebe174b7b
Author: Jenkins <jenkins@biryani.osuosl.org>
Date:   Fri Oct 17 15:17:25 2014 -0700

    cividist - Remove dependency on "realpath" command

commit ffb27137749527c7d6ef919187116d1cf4dbfd40
Author: Jenkins <jenkins@biryani.osuosl.org>
Date:   Fri Oct 17 15:17:14 2014 -0700

    app/config/dist - Make "web" dir

commit fcd26d22b4f431459188603f0daa8b46249c11a5
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 14:37:54 2014 -0700

    cividist - Pass in refs as a parameter instead of scanning for refs

commit 7bedd86dbf0a3bab13e9166d5a5096e9a6953886
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 14:02:30 2014 -0700

    cividist, find-symlink-tree-orphans - Add CLI tool for maintaining symlink tree with nightly tarballs

commit adb253c20b329ca47c41692a9b0fd78a54e4723f
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 14:01:20 2014 -0700

    app/config/dist - Fix CMS_ROOT. Allow suffixes on version#s.

commit 53c51bb04f0b05827838ae842d644c71d36cc2e3
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 14:00:55 2014 -0700

    app/config/dist - Download l10n

commit b207612f702bfe55dbf0140bdd325302a93a4ae3
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 17 11:58:34 2014 -0700

    app/config/dist - Split "src" and "out" dirs. Automatically determine DM_VERSION.

commit a0137ef295255af1acdca76d456047abaed2bf3c
Merge: cc85ff6 5fdff7b
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Oct 15 16:33:07 2014 -0700

    Merge pull request #94 from totten/master-vol-ver

    civibuild.aliases.sh - Specify particular versions of CiviVolunteer

commit cc85ff65890f5f40b8cde4b977619452a3ae143c
Merge: 5d50d65 b2d5933
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Oct 15 16:18:46 2014 -0700

    Merge pull request #93 from totten/master-debug

    app/config/drupal-demo - Enable debug output

commit 5fdff7b991e702c99def2fa4bb7f5e2df4373669
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Oct 15 16:11:09 2014 -0700

    civibuild.aliases.sh - Specify particular versions of CiviVolunteer

commit b2d5933f9e73924b141e876007b048365f2bbb8c
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Oct 15 14:46:04 2014 -0700

    app/config/drupal-demo - Enable debug output

    This is inspired by CRM-15457 .

commit 5d50d65cad356b5965a2db87a912dfb26390bb88
Merge: ea4c26c e863e4e
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Oct 13 15:01:39 2014 -0700

    Merge pull request #92 from totten/master-extdir

    app/config/extdir - Add a build-type for mocking the extension browser/downloader.

commit e863e4eba6e35184e14092871fab031225849a85
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Oct 13 14:40:55 2014 -0700

    app/config/extdir - Add a build-type for mocking the extension browser/downloader.

commit ea4c26cc5bc4f4c88476eb32f2153b5e261f994e
Merge: e1137e7 f4d6e5b
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 12 11:58:00 2014 -0700

    Merge pull request #91 from totten/master-composer-20141012

    composer.json - Update amp. Fix inconsistent drush metadata (in .lock).

commit f4d6e5b66f2440a2dcb4ccfd7474e6131235bc40
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 12 11:56:07 2014 -0700

    composer.json - Update amp. Fix inconsistent drush metadata (in .lock).

commit e1137e796364852f434ce888ead5c24e9b791a1d
Merge: 7282c8a 7add941
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 12 10:28:16 2014 -0700

    Merge pull request #90 from totten/master-mktemp

    mktemp.php - Add extra option for specifying the basedir

commit 7add94157488e7d25338656bf5d631fffddb89df
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Oct 12 10:27:21 2014 -0700

    mktemp.php - Add extra option for specifying the basedir

commit 7282c8a01cbb19af36f1fa2f70451fe6762c51c5
Merge: 709edcc ae10c9f
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 3 16:48:38 2014 +0100

    Merge pull request #89 from futurefirst/infra-114

    Fix for INFRA-114 by generating a setup.conf that calls amp export inste...

commit ae10c9fa101f95f748af27725f08f0389dc42080
Author: David Knoll <david@futurefirst.org.uk>
Date:   Fri Oct 3 13:20:51 2014 +0100

    Fix for INFRA-114 by generating a setup.conf that calls amp export instead of hardcoding DB credentials

commit 709edcccedd35791bdc84aacdf3c14c9867513ea
Merge: 7c936b7 6307d74
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 3 09:01:18 2014 +0100

    Merge pull request #88 from totten/master-dl-lock

    civi-download-tools - Protect against concurrent or offline execution

commit 6307d743f5fce293f0432f12114382da8646a14c
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 3 09:00:07 2014 +0100

    civibuild - Skip civi-download-tools when $OFFLINE

commit c1a5080a8588cdea561d6b5ea30aeca0439bb24d
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 3 08:56:45 2014 +0100

    civi-download-tools - Protect against concurrent execution

commit 7c936b75224cd96b1403c80b238ff3b145835a5f
Merge: d1b3840 1b5df3a
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Oct 3 08:40:01 2014 +0100

    Merge pull request #87 from totten/buildkit-aliases

    civibuild - Add support for build-type-aliases like "d44" or "wp45"

commit 1b5df3ab193eea24fdea9060dfa8a073987bd3a9
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Oct 2 08:10:56 2014 +0100

    civibuild - Add support for build-type-aliases like "d44" or "wp45"

commit d1b384003106f6262baedc19b99a75130bf37971
Merge: 281ecf7 3aa9b4c
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 30 07:48:02 2014 +0100

    Merge pull request #86 from totten/phpunit-xml-cleanup

    bin/phpunit-xml-cleanup - Add script

commit 3aa9b4c3c60f851aaf440f01165c0b786f3e0a96
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 30 07:46:52 2014 +0100

    bin/phpunit-xml-cleanup - Add script

commit 281ecf76a3806288a8f3709ba98d2ba1a3beae4f
Merge: f8b9420 3ec3cfd
Author: Yashodha Chaku <yashodha.chaku@webaccess.co.in>
Date:   Wed Sep 24 09:47:40 2014 +0530

    Merge pull request #85 from yashodha/hrdemo-changes

    HR-371 : hrdemo changes

commit 3ec3cfdf9f534135f6fe2e6af8afb0a658b1909a
Author: CiviCRM <info@civicrm.org>
Date:   Wed Sep 24 10:04:49 2014 +0530

    hrdemo changes

commit f8b94204d76d00017b100f2399749a0de3a179dc
Author: Jenkins <jenkins@test-debian6-1.civicrm.osuosl.org>
Date:   Tue Sep 23 15:49:57 2014 +0000

    composer.json - Downgrade drush to fix regression on test-debian6-1

commit 1275b54086eaa1f35c93c3da89a7720bc36cae83
Merge: 5f85535 23898c0
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 23 13:21:42 2014 +0100

    Merge pull request #81 from totten/master-civitest

    INFRA-124 - Support for paratest

commit 23898c0c21e04ff100580e92658631b0842e5ed3
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 23 13:15:58 2014 +0100

    INFRA-124 - clone-create - Don't recreate DB unless the snapshots have changed (or unless --force is specified)

commit 5f8553582c4f01e91a337ea4e4d3c9bf6f401bef
Merge: d37cd77 ed85591
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 23 11:45:48 2014 +0100

    Merge pull request #83 from totten/master-civix-14091

    civi-download-tools - Update civix to 14.09.1

commit ed8559184fc1843bf6b0b5199fce794b3003bf05
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 23 11:42:09 2014 +0100

    civi-download-tools - Update civix to 14.09.1

commit b0d56de9529489dbc952d8c5f4f4e107946619e4
Author: CiviCRM <info@civicrm.org>
Date:   Tue Sep 23 16:12:07 2014 +0530

    HR-371

commit d37cd77a841376e51e263f67411d4822bc0c2842
Merge: cbddb4b b0d56de
Author: Yashodha Chaku <yashodha.chaku@webaccess.co.in>
Date:   Tue Sep 23 15:55:35 2014 +0530

    Merge pull request #82 from yashodha/hrdemo-changes

    HR-371 - changes for demo text

commit 2ba8a662806762cab2b870151cd05dd77be71607
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Aug 6 00:13:15 2014 -0700

    composer.json, composer.lock - Add phpunit, paratest

commit cf5fa91194248c4bd5d557505dddab44f269927e
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Sep 21 00:18:23 2014 -0400

    INFRA-124 - 100-paratest-dsn.php - Allow CLI option to forcibly reset DB

commit f6128882858bef1bc3ebfcde30cc4f5b89bc8179
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Sep 15 19:00:29 2014 -0400

    INFRA-124 - Generate and accept cookie "civiConsts"

    This allows DB configuration options to propagate from the test-tier to the web-tier.

commit 02564c24c249c3751caad9bc78275ecf265c3027
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Sep 3 01:35:31 2014 -0700

    INFRA-124 - When using paratest, automatically setup multiple DBs using "civibuild clone-create"

commit 1a48a4dae36686f621d0203b0462cc42a7113ec4
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 22:04:06 2014 -0700

    _amp_install_* - Fix concurrency bug

commit 714c88005d3e1a6dc3f15add8520123a65a6b179
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 20:37:41 2014 -0700

    INFRA-124 - civibuild - When destroying a build, also destroy any cloned DBs

commit 39c0e5f942a5f955852cecc7ca65ad7f2c70d5ad
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 20:05:08 2014 -0700

    INFRA-124 - civibuild - Implement civibuild_clone_create, civibuild_clone_show, civibuild_clone_destroy

commit 348aa78e0c9b241167a3b7f0be27e5739eae214b
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 19:30:09 2014 -0700

    INFRA-124 - civibuild - Extract function _amp_snapshot_restore()

commit 72fa38bc813b205af8a2aa15f4c4fd2d9f1a54df
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 18:57:18 2014 -0700

    INFRA-124 - civibuild - Add clone-create, clone-show, clone-destroy (skeletal code)

commit 0fe42c9d67ff211970683963fa1a998fc07b8618
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 17:57:59 2014 -0700

    INFRA-124 - civibuild - Allow injecting pre or post settings (via civicrm.settings.d, drupal.settings.d, etc)

commit 1d62428b4f7ef261ef5733e1df6af5d249f7f6b2
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 17:27:22 2014 -0700

    INFRA-124 - civibuild - Allow injecting options into civicrm.settings.php for CiviTest

commit 12ed1c6db7981fc44f3c6249c9479bb15e9561bf
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 17:12:59 2014 -0700

    INFRA-124 - civibuild - Generate/save SITE_TOKEN

    This will be useful for validating the Webtests' DSN cookie

commit cbddb4bb638ea2f4bf6067fc3750221964220487
Merge: 3332dd0 fd96488
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Sep 19 11:14:19 2014 -0400

    Merge pull request #80 from totten/master-forceinst

    Bump civix. Tweak civibuild.

commit fd96488ca1bf3e1f0b8e8f8a807e72bb2cad25e3
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Sep 19 11:10:21 2014 -0400

    civibuild - Relax confirmation slightly

     * DO: Require confirmation to destroy a file tree ("civibuild destroy" or "civibuild create --force")
     * DO NOT: Require confirmation to destroy a data set ("civibuild install --force" or "civibuild reinstall")

commit 81cd022fa027666c727873c842b81981f2a146cb
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Sep 19 11:09:04 2014 -0400

    civix - Bump from v14.01.0 to v14.09.0

commit 3332dd0bdb7f9c15a2d7f40af43624cbe164ff37
Merge: 9fa77cf 5fe2fa7
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Sep 19 08:38:26 2014 -0400

    Merge pull request #79 from totten/JSProffitt-master3

    joomla-demo - Use joomla-console to download/install CMS

commit 5fe2fa7961f789b491befb4d021c4218170c5ed0
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Sep 18 02:53:29 2014 -0400

    joomla-demo - Remove dead/redundant code. Add comments.

commit 2bb75f52a3056d7e812efbddc2532bfa4c3b4e76
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Sep 17 23:50:12 2014 -0400

    joomla-demo - Multiple changes:

     * Separate download & install phases
     * Change directory structure so that all source is under WEB_ROOT
       * WEB_ROOT/joomla -- The Joomla directory (was: WEB_ROOT)
       * WEB_ROOT/src/civicrm -- The CiviCRM directory (was: PRIVATE_ROOT/src/civicrm)
       * (This fixes an issue where "civibuild reinstall" destroyed PRIVATE_ROOT and thus all civi src)

commit 2867abe6e085d80e5c1137cde876b3b9c1127114
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Sep 17 19:09:03 2014 -0400

    composer.json - joomla-console - Use totten/master-buildkit. Cleanup other deps.

commit cc0ffb8c44a725f6e916d11751ba3a521a634afe
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 16 18:44:39 2014 -0400

    joomla-demo - When doing a full recreate, private/src/civicrm should be cleared out.

commit b66df6248ed3eed0992ce0a58fd00018be3fbd60
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Sep 16 18:44:22 2014 -0400

    gitignore - Add boris and joomla

commit 140b93abf9504bd30dae6b69e5e06a3cacead078
Author: Jeremy Proffitt <jeremy@mobiusnm.com>
Date:   Tue Sep 16 12:10:13 2014 -0400

    added permissions adjustments to buildkit install

commit 6be60bf3ddcfa175bf8f4c662e78f17bdf28a58c
Author: Jeremy Proffitt <jeremy@mobiusnm.com>
Date:   Tue Sep 16 02:10:18 2014 -0400

    updated joomla install and fixed composer.json type

commit 1cefe3b21d0f64680ca63002ae8ee32d1487d4ad
Merge: a57236c 9fa77cf
Author: Jeremy Proffitt <jeremy@mobiusnm.com>
Date:   Tue Sep 16 00:26:09 2014 -0400

    fixed merged conflicts

commit a57236c8a1b3612594a5316c7b532b1d5f936d37
Author: Jeremy Proffitt <jeremy@mobiusnm.com>
Date:   Tue Sep 16 00:21:01 2014 -0400

    added Joomla console, updated amp/git scan, modified joomla install scripts

commit 9fa77cf1a87f1769b8172c055190fb638e7ea83e
Author: Tim Otten <totten@civicrm.org>
Date:   Mon Sep 15 11:15:52 2014 -0400

    civibuild - Refine confirmations

commit cc1b2ba23a45626fdc6ffcdf28f242d8bb38124b
Merge: 3e8abcd afb78f7
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Sep 14 21:18:33 2014 -0400

    Merge pull request #77 from civicrm/master-confirm

    civibuild - When used interactively, confirm destructions

commit afb78f7b8240fc578e7a997aea01f864a5195d78
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Sep 14 19:52:37 2014 -0400

    civibuild - When used interactively, confirm destructions

commit 3e8abcd17d2154cf6cc15d38183e9e25e40f255d
Merge: 2b3c1c1 a939b1f
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Sep 14 14:45:30 2014 -0400

    Merge pull request #76 from totten/master-dist

    app/config/dist - Add

commit 2b3c1c13021e9420881bfbc39fbfaf4423ae69b2
Merge: 99204d3 dd8228d
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Sep 14 14:37:53 2014 -0400

    Merge pull request #75 from totten/master-wpcli

    composer.json - Update wp-cli

commit a939b1ffe5cd0bd3ee9127e29509f8d88f546af7
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Sep 14 13:45:10 2014 -0400

    app/config/dist - Add

    This is useful checkout for distmaker and merge-forward

commit dd8228dc16f2d0afae79cf6eadf5868093305118
Author: Tim Otten <totten@civicrm.org>
Date:   Sun Sep 14 13:12:08 2014 -0400

    composer.json - Update wp-cli

commit 99204d3241c8213518873fa3f10664fab6a130a6
Merge: d5673f9 235b7bd
Author: Tim Otten <to-git@think.hm>
Date:   Fri Sep 5 16:19:26 2014 -0700

    Merge pull request #72 from adamwight/master

    Configure twig and phpmailer location variables

commit 235b7bd5eeacae0a52ef31ced524c595703d2a20
Author: Adam Roses Wight <awight@wikimedia.org>
Date:   Fri Sep 5 15:54:32 2014 -0700

    Configure twig and phpmailer location variables

commit d5673f947e4caed863810db606c7a204b8e7aa5d
Merge: 0eb2a84 f09ef49
Author: Tim Otten <to-git@think.hm>
Date:   Wed Sep 3 01:57:14 2014 -0700

    Merge pull request #71 from totten/master-gitcache

    civibuild - When updating git/svn caches, check for timeouts and OFFLINE mode

commit f09ef49db18aa74a160eae2d239f33cdec920174
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Sep 3 01:22:33 2014 -0700

    civibuild - Enforce timeout when updating git/svn caches

    We sporadically encounter issues where "git fetch" hangs.

commit 5642e755b917c48c2868be341e9510a9200bfafe
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 28 20:34:17 2014 -0700

    civibuild - If OFFLINE is set, then skip cache updates

commit 0eb2a84312e47976d4f6400ab85de14921f8f663
Author: colemanw <coleman@civicrm.org>
Date:   Thu Aug 28 17:28:01 2014 +0100

    Update version numbers in readme.md

commit e6c2e0e5f633e1e067c57abcc6b5989828984e29
Author: Tim Otten <totten@civicrm.org>
Date:   Fri Aug 22 02:14:05 2014 -0700

    git_cache_setup - Change fetch call

    There was an incident in which a new build was running old code. Trying
    another variation on "git fetch".

commit 7ec454adef930c5f589b26a5b47808a7c98ce44f
Merge: 2e959d1 2b4c304
Author: Tim Otten <to-git@think.hm>
Date:   Thu Aug 21 22:43:37 2014 -0700

    Merge pull request #70 from totten/master-concurrent-buildtype

    app/config/*/download.sh - Fix race among concurrent "drush make" builds

commit 2b4c304fb022e376a365897c749d7acefed75bcd
Author: Tim Otten <totten@civicrm.org>
Date:   Thu Aug 21 22:40:21 2014 -0700

    app/config/*/download.sh - Fix race among concurrent "drush make" builds

    If two concurrent build try use the same build-type with different config
    options, then the drush-make files may conflict.

commit 2e959d1b2bcec14d651d43fb4fd08f64a567ff51
Merge: a8f9aa2 fa43947
Author: Tim Otten <to-git@think.hm>
Date:   Wed Aug 20 02:48:34 2014 -0700

    Merge pull request #69 from totten/master-composer-fixup

    composer.lock - Fixup

commit fa43947c3a590a5ce85bf169cba472f2de1eeb3e
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Aug 20 02:47:21 2014 -0700

    composer.lock - Fixup

commit a8f9aa22a1806ade470baabc8e34b046e7cf23c3
Merge: 8f76553 4b1fc22
Author: Tim Otten <to-git@think.hm>
Date:   Wed Aug 20 02:42:06 2014 -0700

    Merge pull request #68 from totten/master-ut-fixes

    civicrm/upgrade-test - Add support for alt host/port. Add support for "@4.4" style args.

commit 4b1fc2224cd1d407289fcec5294f5607eaaa94c8
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Aug 20 02:40:57 2014 -0700

    civicrm/upgrade-test - Add support for alt host/port. Add support for "@4.4" style args.

commit 8f765534e25a0e8b8bcea042d9760f7e03e7125a
Merge: 2dc4999 491450b
Author: Tim Otten <to-git@think.hm>
Date:   Tue Aug 19 21:36:24 2014 -0700

    Merge pull request #67 from totten/master-show-html-dir

    civibuild show - Output an HTML directory instead of a single HTML file

commit 491450b8ef6d64f8e829df8549c0960f31e863a6
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Aug 19 21:31:49 2014 -0700

    civibuild show - Output an HTML directory instead of a single HTML file

commit 008b6e80208dea6b2a472b0b866351c3c40d1ab7
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Aug 19 21:25:43 2014 -0700

    Rename civibuild.show-html.php to views/show-index.php.

commit 460e90abaf8f5b03060f7c322ddde5f4fc2839ae
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Aug 19 21:03:49 2014 -0700

    civibuild - Extract function civibuild_show_html

commit 2dc49998ee3a7c528bf94549fac8c0817784c114
Merge: 2159112 4be153b
Author: Tim Otten <to-git@think.hm>
Date:   Tue Aug 19 19:46:30 2014 -0700

    Merge pull request #66 from totten/master-show-html

    civibuild show -- Add support for generating a detailed HTML report

commit 4be153be91af8c47d377ec069ea191a379b8722f
Author: Tim Otten <totten@civicrm.org>
Date:   Tue Aug 19 18:17:52 2014 -0700

    civibuild show -- Add support for generating a detailed HTML report

commit 2159112c37ede7fc0328badca9c129424ec9f71b
Author: Tim Otten <totten@civicrm.org>
Date:   Wed Aug 13 19:04:01 2014 -0700

    Change technique for forcing display_errors=1

Change-Id: I8b59573b6fae789e796fe188b2bf6743656dd6a1