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
..
2014-07-30 16:19:26 +02:00
2015-09-13 10:55:44 +02:00
2014-02-08 14:59:52 +01:00
2014-07-30 16:19:26 +02:00