Merge branch 'stable'

This commit is contained in:
Chris Eppstein 2012-03-18 01:56:14 -07:00
commit 1f70c7e35d

View File

@ -151,6 +151,7 @@ Feature: Command Line
| watch | | watch |
And I should see the following "other" commands: And I should see the following "other" commands:
| config | | config |
| extension |
| frameworks | | frameworks |
| grid-img | | grid-img |
| help | | help |