Vladimír Čunát 09af15654f Merge master into closure-size ...

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

2016-03-08 09:58:19 +01:00

..

activation

Merge master into closure-size

2016-03-08 09:58:19 +01:00

boot

Merge master into closure-size

2016-03-08 09:58:19 +01:00

etc

etc: Use a friendlier name than "etc-file"

2015-12-30 15:17:30 +01:00