5 commits

Author	SHA1	Message	Date
Peter Simons	2d326e5032	Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix	2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk	7a45996233	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
Eelco Dolstra	40f7b0f9df	Another attempt to eradicate ensureDir ... See c556a6ea46.	2014-06-30 14:56:10 +02:00
Rob Vermaas	cf00cd5e36	Add support for printing qr code for google-authenticator.	2014-02-20 12:30:49 +01:00
Lluís Batlle i Rossell	c908d2130f	Adding 'google-authenticator'	2013-03-30 21:06:06 +01:00