Merge branch 'bug-965' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 24 Nov 2011 16:12:57 +0000 (17:12 +0100)
committerMichael Tänzer <neo@nhng.de>
Thu, 24 Nov 2011 16:12:57 +0000 (17:12 +0100)
1  2 
www/index.php

diff --cc www/index.php
Simple merge