Daryl Borth 35f6f7fd7a Merge remote-tracking branch 'refs/remotes/origin/master' into pr/686 ... # Conflicts: # readme.txt # update.xml		2016-06-25 15:02:30 -06:00
..
language.settings.xml	Merge remote-tracking branch 'refs/remotes/origin/master' into pr/686	2016-06-25 15:02:30 -06:00