Merge branch 'master' into dev

Conflicts:
	RELEASENOTES.md
	plugin.xml
This commit is contained in:
Andrew Grieve 2014-02-27 12:01:26 -05:00
commit 17ba417572

Diff Content Not Available