Bug 1007079 - update foo.txt
Bug 1007079 - merge pull request #2 from autolander:branch2 to autolander:master