[gimp] (2 commits) Non-fast-forward update to branch alxsa-psd-cmyk-export

[Jehan <jehanp src gnome org>]

The branch 'alxsa-psd-cmyk-export' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  d857e63... plug-ins: Export PSD as CMYK file

Commits added to the branch:

  d4f12a8... Issue #8561: unrecognized command-line options '-mmx', '-ss (*)
  4bec443... plug-ins: Export PSD as CMYK file

(*) This commit already existed in another branch; no separate mail sent