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)
Conflicts:
pages/index/8.php


Trivial merge