Joël Pittet authored Oct 15, 2016 and Jakob Perry committed Oct 15, 2016

Issue #2479879 by temkin, joelpittet, Mixologic: Move 'panels_page_allowed_types' variable to a custom table

Issue #2787123, #2188277, #2786073 by malcomio, japerry, dsnopek, ericjenkins: Update 7302 needs database updates before executing.

Issue #1277908 by jweowu, das-peter, samhassell, Kristen Pol: Introduce UUIDs onto panes and display for better exportability and i18n support

#879482 by mvc: Ensure Panels and CTools module files are loaded during update. Apparently could cause WSOD if not.

conflicts.

Conflicts:
	contexts/terms.inc
	docs/sample_plugin_ct.inc
	help/plugin-style.html
	help/plugins-style.html
	plugins/layouts/threecol_33_34_33_stacked/threecol_33_34_33_stacked.inc
	plugins/layouts/twocol_bricks/panels-twocol-bricks.tpl.php
	plugins/styles/corners/rounded_corners.inc
	plugins/styles/default.inc
	plugins/styles/list.inc

Catching HEAD back up with all the changes on DRUPAL-6--3. Now ready to move forward with the 7.x port!

Initial D6 work -- this includes only panels.module stuff. Right now the drag & drop display editor works, layout, layout settings and render works. Special features such as cache and styles may or may not work.