Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 23:27:53 +0000 (11:27 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 23:27:53 +0000 (11:27 +1200)
commit21e57e82ed57900953d19d6f5ea4cfd0b35856e0
treeb1e56ec8fd2d007bd7a0c192d935b2d2a15e4ba3
parenta0145560b97881a516b14877fe64399e44793f81
parent7abaa5f46cb52a630443373a28885f03bddb25d3
Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle