merged cli_integration

This commit is contained in:
Adam Blackburn
2009-11-21 11:56:03 -06:00
8 changed files with 306 additions and 0 deletions