merge fixup: connect the parent of the previous commit

The previous "merge" commit was missing the master parent by accident.
Thanks to @errge for noticing.
This commit is contained in:
Vladimír Čunát 2014-09-14 17:31:12 +02:00
commit 2e139a9eff

Diff Content Not Available