Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 10 Aug 2011 05:39:32 +0000 (13:39 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 10 Aug 2011 05:39:32 +0000 (13:39 +0800)
commit751a6d3c29a9b8276155253a831fca4c0648ef17
treea2abc9f6c0afd2a328174239480a3ea0d770e2d7
parent09e35896d472139f0e2782da9bb1343a5b57a8be
parentf40bbf7dce891a5fb8a74216f912667eb75c947d
Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle