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:
The previous "merge" commit was missing the master parent by accident. Thanks to @errge for noticing.