Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...
[rails.git] / vendor /
drwxr-xr-x   ..
drwxr-xr-x - generators
drwxr-xr-x - plugins