commit 24aed76852f7163756486f5bb2ac8cee92bdb968 Merge: 8c2259c 7438c0e Author: Chris W cwacek@gmail.com Date: Tue Jan 15 13:17:44 2013 -0800

Merge pull request #1 from cwacek/bug_7924

Merging fixes for #7924

app.py | 46 ++-- compass.py | 20 +- testing/app_tests.py | 53 ++++ testing/expectations/README | 2 + testing/expectations/noparam.expected | 1 + testing/expectations/top5.expected | 1 + testing/testdata.json | 452 +++++++++++++++++++++++++++++++++ util.py | 11 +- 8 files changed, 557 insertions(+), 29 deletions(-)