-
Committer:
Tarmac
-
Author(s):
mrazik
-
Date:
2013-05-22 20:37:54 UTC
-
mfrom:
(105.1.4 fasttrack-conflict)
-
Revision ID:
tarmac-20130522203754-bfb3owxll66rezxv
Fixing a bug when fasttrack merge with conflict was unable to update the merge proposal.
Approved by Francis Ginther, PS Jenkins bot.