Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 09:32:14 +0000 (10:32 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 09:32:14 +0000 (10:32 +0100)
commitaa96a20027fd58d868754b0afa821a293c998ecd
treeef4bf36936a60acf2ba4b7dd6613ef2c531ad245
parent1d81e1afc0f20608d8fe0a14d1622b7060af740a
parent7f45111e36de33e8f81395c23acfc75e1e377f2b
Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle