Merge branch 'MDL-25589' of git://git.luns.net.uk/moodle
commite1ce9a66703dabf92f9609eb6d1217cd125922a6
authorPetr Skoda <commits@skodak.org>
Mon, 3 Jan 2011 17:02:44 +0000 (3 18:02 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 3 Jan 2011 17:02:44 +0000 (3 18:02 +0100)
treef6f612edd39baa0fedad8b87b5f662d57d882413
parent6a81ececb340e235cf766a4e58893f765e3e92fa
parentf8f384b5b4a095ae74c378a7aa9994f76141cd6e
Merge branch 'MDL-25589' of git://git.luns.net.uk/moodle