Merge pull request #2330 from flx42/include_config_file_check
authorJonathan L Long <jonlong@cs.berkeley.edu>
Sat, 25 Apr 2015 02:55:31 +0000 (19:55 -0700)
committerJonathan L Long <jonlong@cs.berkeley.edu>
Sat, 25 Apr 2015 02:55:31 +0000 (19:55 -0700)

Trivial merge