Merge branch 'MDL-47073-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 03:54:21 +0000 (11:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 03:54:21 +0000 (11:54 +0800)
commitdf8095156e13903a76c3e35ddf77a756717dbde7
tree5aa91a2dcbbc3f2a56eecf88e8a1659275eadd61
parent117dc470bc8402af5819de6fb26cae7784da2fd9
parentbbbdfc86102347cedf745c7231b307aca8e87b4e
Merge branch 'MDL-47073-master' of git://github.com/junpataleta/moodle