bug31040 180 B

123
  1. o Minor bugfixes (developer tooling):
  2. - Only log git script changes in post-merge script when merge was to the
  3. master branch. Fixes bug 31040; bugfix on 0.4.1.1-alpha.