Merge branch 'MDL-27169_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Jun 2011 02:43:57 +0000 (10:43 +0800)
committerSam Hemelryk <sam@moodle.com>
Thu, 23 Jun 2011 02:43:57 +0000 (10:43 +0800)
commit58c724a613fc9ee09b8848cec3ba310c203f4513
treea099f631d16fe4b8fb27a51456aa0e1823255cbd
parent5973f0b53d1f4f2ef73a99b22dab9b897cf1471e
parenta8f3f4ccf196e14c3d16f632d0af73664ec1a10e
Merge branch 'MDL-27169_master' of git://github.com/stronk7/moodle