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
..
2015-08-19 13:25:44 -07:00
2015-08-19 13:25:44 -07:00
2015-08-19 13:25:44 -07:00
2016-03-08 09:58:19 +01:00
2016-02-26 17:58:58 +00:00
2016-02-26 12:32:33 -06:00
2015-07-21 11:41:20 +02:00