In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Problem with previous attempt was that R would understand the command was given in UTF8, but would
not be smart enough to flag resulting strings as UTF8-encoded. This fix instead simply uses an
encoder that will turn - e.g. - "ä" into "\303\244", instead of "".

EXPERIMENTAL Always submit non-user commands UTF8-encoded. Now how can we achieve the same for user commands?

  - the OS X bundle didn't have a working help browser any more, fixed this by keeping more packages in the bundle again

Side-effect of this commit should be that the dailies are re-built against R 3.3.0 in the launchpad PPA.

BUG: 361370

Adjust packaging script to support creating ~rc-release packages.

- Back out the package split for the time being.

Fixes for test failures in import export plugins, due to KUrlRequester returning absolute paths, now.

These had been committed, earlier (for 0.6.4), but it seems I have messed up the merge in commit 4e73776e .

  - there's probably still some confusion about $PORTVERS, i was getting 0.6.4 when releases/0.6.5 was installed. have to check

Actually, a separate issue was that "refresh output" was broken, but this did not show as long as the auto-update mechanism was working.

BUG: 360236