Merge branch 'MDL-51615-master' of git://github.com/jleyva/moodle
commitd540aa8c708c068e0004fbf75dfcd44292aedab2
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:42:17 +0000 (6 11:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:00 +0000 (6 16:32 +0100)
tree11d35ef412189f629c1f1b69a799d729322d2d04
parentc1604af966c63efb27ec614b36fa5bf1dc7c8687
parentae67efa8839d34e500258f784e6a6c6f178d5cc2
Merge branch 'MDL-51615-master' of git://github.com/jleyva/moodle
version.php