Franz Pletz e43f2fc868 Revert "lxc: 2.0.4 -> 2.0.6" ... This reverts commit 5d804566df. This was an error on my part. I had the commit sitting on my local master and pulled upstream to rebase my commit before pushing. I didn't notice there was a commit bumping lxc and the auto-merge on the rebase.		2016-11-29 15:42:37 +01:00
..
applications	firefox: 50.0 -> 5.0.1 for CVE-2016-9078	2016-11-29 08:34:13 -05:00
build-support	dockerTools: rsync contents with -keep-dirlinks	2016-11-24 12:48:26 +11:00
data	xits-math: build from source	2016-11-24 01:17:54 +03:00
desktops	Merge pull request #20732 from montag451/epiphany-html5-video	2016-11-27 21:17:13 -05:00
development	kde5.frameworks: 5.27 -> 5.28	2016-11-29 07:02:40 -06:00
games	rogue: Add alternative source archive URLs.	2016-11-26 19:24:01 +00:00
misc	U-Boot: 2016.05 -> 2016.11	2016-11-28 00:23:12 +02:00
os-specific	Revert "lxc: 2.0.4 -> 2.0.6"	2016-11-29 15:42:37 +01:00
servers	groonga: 6.1.0 -> 6.1.1	2016-11-29 15:33:24 +09:00
shells	oh-my-zsh: 2016-11-03 -> 2016-11-16	2016-11-19 20:57:54 -05:00
stdenv	allowUnfree: mention the solution that works for nix-shell as well	2016-11-16 15:14:19 +01:00
test
tools	Add tools/networking/polysh	2016-11-29 17:32:21 +03:00
top-level	Add tools/networking/polysh	2016-11-29 17:32:21 +03:00