Merge branch 'MDL-49894-28' of git://github.com/jleyva/moodle into MOODLE_28_STABLE
commit4140295c9f1d98ee09fe4ca988aafa07dc7fe51f
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 15:10:26 +0000 (16 16:10 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 15:10:26 +0000 (16 16:10 +0100)
treef23d49c16fde3a527218c0b06e5a2c382309031e
parent9d40bd98be5020545279252e78f6aad4573a46ac
parentc58cafbbaa40e18da7f7334ffd16fe8212d1f186
Merge branch 'MDL-49894-28' of git://github.com/jleyva/moodle into MOODLE_28_STABLE