Drupal 7.26
Drupal 7.26 - a security update recommended for all sites.
Please see https://drupal.org/SA-CORE-2014-001 for details
Routine file maintanence.
Drupal 7.26 - a security update recommended for all sites.
Please see https://drupal.org/SA-CORE-2014-001 for details

Was: Merge branch 'master' of git://github.com/pantheon-systems/drops-7
Merge branch 'master' into subtheme

Conflicts:
	sites/all/themes/adaptivetheme/kwantzu_subtheme/_README.txt
	sites/all/themes/adaptivetheme/kwantzu_subtheme/config.rb
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/_README.txt
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/global.base.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/global.styles.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/images/dark/arrow-down.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/images/dark/arrow-right.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/images/help.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/images/warning.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/lt-ie9.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/print.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/responsive.custom.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/responsive.desktop.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/responsive.smartphone.landscape.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/responsive.smartphone.portrait.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/responsive.tablet.landscape.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/css/responsive.tablet.portrait.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/favicon.ico
	sites/all/themes/adaptivetheme/kwantzu_subtheme/images/_README.txt
	sites/all/themes/adaptivetheme/kwantzu_subtheme/images/touch-icon-h.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/images/touch-icon-l.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/images/touch-icon-m.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/kwantzu_subtheme.info
	sites/all/themes/adaptivetheme/kwantzu_subtheme/layouts/_README.txt
	sites/all/themes/adaptivetheme/kwantzu_subtheme/layouts/page/naked/naked.admin.css
	sites/all/themes/adaptivetheme/kwantzu_subtheme/layouts/page/naked/naked.inc
	sites/all/themes/adaptivetheme/kwantzu_subtheme/layouts/page/naked/naked.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/logo.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/_README.txt
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/_base.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/_custom.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/global.base.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/global.styles.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/lt-ie9.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/print.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/responsive.custom.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/responsive.desktop.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/responsive.smartphone.landscape.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/responsive.smartphone.portrait.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/responsive.tablet.landscape.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/sass/responsive.tablet.portrait.scss
	sites/all/themes/adaptivetheme/kwantzu_subtheme/screenshot.png
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/check_all.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/html5.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/media_queries.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/onmediaquery.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/respond.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/scalefix.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/vertical-tabs.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/scripts/window-size.js
	sites/all/themes/adaptivetheme/kwantzu_subtheme/template.php
	sites/all/themes/adaptivetheme/kwantzu_subtheme/templates/block.tpl.php
	sites/all/themes/adaptivetheme/kwantzu_subtheme/templates/html.tpl.php
	sites/all/themes/adaptivetheme/kwantzu_subtheme/templates/node.tpl.php
	sites/all/themes/adaptivetheme/kwantzu_subtheme/templates/page--full-width-wrappers.tpl.php
	sites/all/themes/adaptivetheme/kwantzu_subtheme/templates/page.tpl.php
	sites/all/themes/adaptivetheme/kwantzu_subtheme/templates/taxonomy-term.tpl.php
	sites/all/themes/adaptivetheme/kwantzu_subtheme/theme-settings.php
Removed theme generated files from inside the theme folder.