tree a79e23c3af36ec8d914044e25a3be86b4557782e
parent 3c36ee1fcf64371fc97d521dcd7c721145858fa6
parent 4d2c87350d2ddeb2bd895279df45a61c9e7ddfa4
author Andrew Grieve <agrieve@chromium.org> 1393623024 -0500
committer Andrew Grieve <agrieve@chromium.org> 1393623024 -0500

Merge branch 'dev' (early part)

Conflicts:
	RELEASENOTES.md
	plugin.xml