Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...
[rails.git] / vendor / generators / daemon / templates /
drwxr-xr-x   ..
-rw-r--r-- 105 daemons
-rw-r--r-- 77 daemons.yml
-rwxr-xr-x 365 script.rb
-rwxr-xr-x 435 script_ctl