Merge remote-tracking branch 'gsathya/bug_6639'
commitee57adb1bd2c31a13b61cbfc5e371d965b866150
authorKarsten Loesing <karsten.loesing@gmx.net>
Sun, 9 Sep 2012 21:37:43 +0000 (9 17:37 -0400)
committerKarsten Loesing <karsten.loesing@gmx.net>
Sun, 9 Sep 2012 21:37:43 +0000 (9 17:37 -0400)
tree3ff104e9a02eebe41aab98523a4ef87e77c9ac8d
parent6a2de26330920f2c87728ae5c1c63a044d2838c5
parentb22497f234ca2dd513ea25557432897f98bdb5bb
Merge remote-tracking branch 'gsathya/bug_6639'

Conflicts:
templates/result.html
templates/index.html