Shea Levy a46d2e3150 Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs
nixos: add Murmur module (Mumble chat)

Conflicts:
	nixos/modules/misc/ids.nix
2014-04-05 15:18:14 -04:00
..
2014-03-29 10:56:07 +01:00
2014-03-21 18:02:15 +01:00
2014-04-01 20:20:33 +03:00
2014-03-29 05:31:27 -05:00
2014-03-14 14:40:17 +01:00
2014-04-03 22:46:45 +02:00
2013-11-12 13:48:30 +01:00