Eelco Dolstra d5047faede Remove uses of the "merge" option attribute ... It's redundant because you can (and should) specify an option type, or an apply function.		2013-10-28 22:45:56 +01:00
..
activation	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
boot	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
etc	Fix bogus mkOption types	2013-10-28 22:45:56 +01:00
upstart	Get rid of the only use of mkDefaultValue	2013-10-28 22:45:54 +01:00