Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle
commit1b14f1a4977fe679fa28c238d4eda478d07d0ac2
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 06:06:17 +0000 (24 14:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 06:06:17 +0000 (24 14:06 +0800)
treef20820a5d2f07327429f09828cd9eae44f226f0f
parent33492029de537dfe0403a8d034be15a6da6b2d94
parent5fe4bd6422dc5ef2c160b138ac30d9acd0d9e7eb
Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle