Merge branch 'MDL-55650-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 06:42:55 +0000 (14:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 06:42:55 +0000 (14:42 +0800)
commitea012c47b5165493fdec4b2100b89fd29b7e6fa8
tree7f7456c6e721c1300d6c2ef5c9d3e5d15c6bad6d
parenta74218d4640186fc67d5edf53d9adc6d4fb1b187
parentb16b1f86b1d2a012655d529d7d2978a478ff3b23
Merge branch 'MDL-55650-master' of https://github.com/sammarshallou/moodle