Summary of changes:
c6c76ab... Enforces version to avoid miss-match with fedora (*)
fb4fb5f... Re-introduce Conflicts - rfbz#6612 (*)
474cfea... Re-introduce Conflicts (rfbz#6612, kwizard) (*)
9878150... fix typo in nickname (*)
(*) This commit already existed in another branch; no separate mail sent