Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)
commit3cfbdd9e5a2aaa1be1e5327515b4570dc0090149
treed735a8282e32f4fdd3360aaa175e6513930a9eea
parentfc2856aab1d54c6fe2fe573592e005a82662b3c1
parent62ffeb4f0c5b2961ff683ef3ea5fbab04de73011
Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle