Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 00:31:44 +0000 (12:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 00:31:44 +0000 (12:31 +1200)
commit564a41336775902691cf434a9a7805d98774b5c7
treecb5c75f0e66c9197bb61b16ac28d7a027b74f258
parente8bb3c3fa6d6760d9d0852c528d56d5bbd61cec4
parentefbcbd5e46d1cb73fdc27da51732acb56264433d
Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle