Merge pull request #1 from gediminasz/my-branch

My branch
a change on another-branch
Merge pull request #2 from gediminasz/another-branch

a change on another-branch
one more change on master
Merge remote-tracking branch 'origin/master' into my-branch