Bug 1007040 - add foo.txt
Bug 1007040 - merge pull request #1 from autolander:branch1 to autolander:master