Merge branch 'MDL-54646-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:46:59 +0000 (11:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:46:59 +0000 (11:46 +0800)
commit002ea88630e1eab6eda05b2154e76b29ee9b2ab5
treefe94df6670fc3de00a5fa46852be68dd91ec8a24
parent3b7772370117435b089c5a53881d8fe81a7f1259
parentff1fc4d9f45c6070d7166862f2ebcd312b2b8953
Merge branch 'MDL-54646-master' of git://github.com/junpataleta/moodle