commit 7c231ae1029d04e8d3a19e8106539a55e6c5b265 Merge: aefd024 b894185 Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Sep 18 11:52:22 2012 -0400

Merge remote-tracking branch 'gsathya/bug_6677'

app.py | 22 ++++++++++++++++++++-- templates/result.html | 6 +++--- 2 files changed, 23 insertions(+), 5 deletions(-)