Merge branch 'MDL-40996' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:08:15 +0000 (09:08 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:08:15 +0000 (09:08 +1200)
commit761b48df5912e479151ad3530bb4dace822d1daa
treed169a6794292ea8d1fa98163849de45ba188e3d7
parentcd0103fa6043983ee9084a223903411e15615224
parent370ee378f329772359c21d4bd9dd020df25a3f81
Merge branch 'MDL-40996' of git://github.com/timhunt/moodle