Merge branch 'bug-637' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:20:04 +0000 (03:20 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:20:04 +0000 (03:20 +0200)
1  2 
includes/general.php
www/index.php

Simple merge
diff --cc www/index.php
Simple merge