Merge branch 'bug-910' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 15 Mar 2011 22:12:45 +0000 (23:12 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 15 Mar 2011 22:12:45 +0000 (23:12 +0100)
commit6008db0778c3c8b394a6fc5a65b2fa0aeb7189aa
tree5c2f8a0f4dd1074b8c15bc2b0c20e4399769dfae
parent44a40c4c31919fa5e99c001a0ec20c3379faa3e3
parent30e4fd6a7e399d343b37b728f1d9cf27aa3c4bc7
Merge branch 'bug-910' into release

Conflicts:
pages/index/8.php