Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 23:43:13 +0000 (11:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 23:43:13 +0000 (11:43 +1200)
commit58a3ed7df374ffd7cf9b6babe254adbf20e6cfa7
treefc5dada1db4e7b784454c316e36f03f08936a547
parente722133aeea35f90c6d20025a75de939815ab3f9
parentc32290337b83179a0c80542329f331e31a5a77ed
Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle