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
..
2016-01-07 06:39:06 +00:00
2016-03-08 09:58:19 +01:00
2016-03-08 09:58:19 +01:00
2016-03-08 09:58:19 +01:00
2016-03-08 09:58:19 +01:00
2016-03-08 09:58:19 +01:00
2016-01-07 06:39:06 +00:00
2016-03-08 09:58:19 +01:00
2015-12-06 13:35:21 +00:00
2016-03-08 09:58:19 +01:00