Merge branch 'crosshash'
authorHelmut Grohne <helmut@subdivi.de>
Mon, 25 Feb 2013 09:00:50 +0000 (10:00 +0100)
committerHelmut Grohne <helmut@subdivi.de>
Mon, 25 Feb 2013 09:00:50 +0000 (10:00 +0100)
commit659ffcb2afaedf8cf724894a6cea0ffb585ee220
tree43c8a41a2ae148d30ce2a21e42aca6260875e6cc
parent94711787487f3f3dae26979bcbdbeeb77ed883ae
parent3c3e94bf5026d27d9307a825bae77dba968a1d9f
Merge branch 'crosshash'

Conflicts in webapp.py:
 * The fetchall -> fetchiter change caused big conflicts.
 * New hash combination (image_sha512, image_sha512) added.
webapp.py