Moved merge vars into template content sections.
Moved entity import into template content sections.
Moved Site Content Import into MailChimp campaign filter tips. Moved Merge Vars into each content block.
Multiple entity import forms can now function on one page.
Moved merge vars into template content sections.
Moved entity import into template content sections.
Moved Site Content Import into MailChimp campaign filter tips. Moved Merge Vars into each content block.
Multiple entity import forms can now function on one page.
Resolved merge conflicts.
Fixed recursive cache data setting bug.
Merged 7.x-3.x.
Refactored entity import in template editor. Fixed form-within-form issue.
Code cleanup.
Minor code style.
Use Drupal theme_table to render a table for merge variables.
Add description and improve title of import content section.
Use container form element rather than an item wrapped in divs.
Set the element id using the attributes key.
Wrap string in t().
Code style.