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-03 16:15:25 +00:00
2014-08-01 18:19:03 +02:00
2014-11-05 02:47:59 +03:00
2015-09-18 18:48:50 +00:00