Merge commit '246cc0e6b52f455dcb1ab23039202d7498d91d30'
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:12:34 +0000 (14:12 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:12:34 +0000 (14:12 +0100)
commitb2d6484598e2e9a023457c0658ddce3d2203016e
treef109065edc8884f8c8c35ec698f8b8627a08b736
parentb2f806cd9293fa0d3cae35adf7b08358dc93a97a
parent246cc0e6b52f455dcb1ab23039202d7498d91d30
Merge commit '246cc0e6b52f455dcb1ab23039202d7498d91d30'

Conflicts:
course/request.php
version.php