[mate-text-editor/f18] (6 commits) ...fix merge conflicts in sources

[Wolfgang Ulbrich]

Summary of changes:

  e40a56e... Update to 1.7.0 (*)
  28ea638... add 1.6.1 release (*)
  32f6473... add 1.6.1 release to spec file (*)
  6eede44... fix merge conflicts (*)
  60e8a73... fix merge conflicts in spec file (*)
  d6533b7... fix merge conflicts in sources (*)

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