Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle
commitc17e0034a1505091b808645517b00e8636747c75
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 02:55:18 +0000 (9 10:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 02:55:18 +0000 (9 10:55 +0800)
tree12c5f7435c60d25f4ca40e7f504912332264b7b5
parentbd2e5ef17dcdb480223d3c1bc91fe828761f9c3d
parent0ca559a111ac5bcfc8c3d9fcf9d9a657c0784aa2
Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle