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)
commit8ce107ef51d6fd9618d4275b6bca16678aa6bc75
treedea72d37df7ade178f6729ecd64c6ca2b92a3171
parentab9b6452a8752f473c20b07f5efa78fe8f97e1a3
parent57b85e209da09da2e21b666aebce41b85e56d446
Merge branch 'bug-965' into release
www/index.php