Merge pull request #1444 from shackbarth/tests
authorTravis Webb <travis@traviswebb.com>
Mon, 5 May 2014 15:19:16 +0000 (11:19 -0400)
committerTravis Webb <travis@traviswebb.com>
Mon, 5 May 2014 15:19:16 +0000 (11:19 -0400)
get tests to pass


Trivial merge