Merge branch 'wip-MDL-34785-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 01:36:56 +0000 (13:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 01:36:56 +0000 (13:36 +1200)
commit324b489bdba84f35586ae8c908301a6857ead99f
treeae167658eae0c76fb3dfb1a88ce63eda46a498ea
parent98260b31a50c5533f39af435c8d8fa8d41153813
parenta9881c17507c415124e1b1814f5a313a06d03280
Merge branch 'wip-MDL-34785-master' of git://github.com/marinaglancy/moodle