Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:49:49 +0000 (15:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:49:49 +0000 (15:49 +0800)
commit00aa58eb5fc8e134c5d58fd0ad214e73ad508b1c
tree6fb37412a8a0ffbdad09e9ad21c2e8c15f6bb288
parentc46ae2fbc113a843359294bb1b8d20a7a7f37662
parentdbc404de71f8c339dda623580171ef460bcee146
Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle