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-12-17 15:08:21 +01:00
2016-03-06 09:04:51 +11:00
2015-12-03 21:37:55 -05:00
2016-03-06 09:04:51 +11:00
2015-07-23 13:50:26 -03:00
2015-07-30 07:31:53 +02:00
2015-12-30 11:10:30 +01:00
2015-12-04 15:40:47 +01:00