Daryl Borth 3807d335c2 Merge remote-tracking branch 'refs/remotes/origin/master' into pr/349 ... # Conflicts: # .gitignore # update.xml		2016-12-08 19:47:25 -07:00
..
language.settings.xml	Merge remote-tracking branch 'refs/remotes/origin/master' into pr/349	2016-12-08 19:47:25 -07:00