Merge branch 'MDL-27183' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 04:17:10 +0000 (17:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 04:17:10 +0000 (17:17 +1300)
commitcd3061294ab116fa94688c88ba75c020f863f2f9
treec390bdd09b03b4b006c69c59eae0ebebf6222ef7
parentf477e8c1cecbc90eb89ae0f4c1cb9ade72bbf3bf
parente4977ba5c699e642cb53207b5f84fe6522245e57
Merge branch 'MDL-27183' of git://github.com/timhunt/moodle