Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +01:00
..
bittorrentsync	btsync: update 1.4.82 -> 1.4.93	2014-10-28 19:11:53 +03:00
browsers	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
cluster	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
copy-com
davmail
dropbox
dropbox-cli
esniper
feedreaders/newsbeuter
ftp/filezilla
ids
ike
instant-messengers	Update VacuumIM	2014-11-04 12:04:43 +03:00
iptraf
irc	Fix quassel sha256	2014-10-29 10:51:51 -04:00
jmeter
linssid	boost: Remove boost.lib	2014-11-02 17:22:27 -08:00
mailreaders	thunderbird: update to 31.2.0, including security	2014-11-04 15:19:36 +01:00
msmtp
mumble
netperf
newsreaders	slrn: update 1.0.1 to 1.0.2	2014-10-27 12:47:22 -04:00
notbit
offrss
p2p	Merge recent master into staging	2014-11-05 15:00:44 +01:00
pjsip
remote	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
seafile-client
siproxd
sniffers
spideroak
sync
syncthing
umurmur
vnstat
yafc
znc