3 commits

Author	SHA1	Message	Date
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
Vladimír Čunát	f306e67e15	kde5: move files around to simplify merge ... It is analogous to 98d8e1a160.	2016-03-08 09:42:41 +01:00
Thomas Tuegel	98d8e1a160	kde5: consolidate packages into desktops/kde-5	2016-03-01 10:36:00 -06:00