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-03-06 21:16:47 +01:00
2016-02-24 21:51:13 +01:00
2016-01-07 06:39:06 +00:00
2014-11-18 03:31:56 +00:00
2015-06-30 17:16:51 -04:00
2015-09-18 18:48:50 +00:00
2016-01-07 06:39:06 +00:00