152 commits

Author	SHA1	Message	Date
Eelco Dolstra	f0ef6b74b9	Merge branch 'master' of github.com:thatdocslady/nix ... Conflicts: doc/manual/release-notes.xml doc/manual/writing-nix-expressions.xml	2014-09-16 14:13:36 +02:00
Mikey Ariel	8901acc976	Restructuring the Nix manual	2014-08-27 18:41:09 +02:00