Merge branch 'release' into bug-855 bug-855
authorBernhard Fröhlich <bernhard@cacert.org>
Thu, 19 Jan 2012 18:46:01 +0000 (19:46 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Thu, 19 Jan 2012 18:46:01 +0000 (19:46 +0100)
1  2 
www/wot.php

diff --cc www/wot.php
Simple merge