Merge branch 'MDL-54545-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 May 2016 09:24:25 +0000 (10:24 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:09 +0000 (17:16 +0800)
commit7b09be79d6af383fb160df231b83986c73bc292c
tree97fabb3ab8e25747140dde10a00358b4ea0f739c
parent76943644d43c905895c91756fc1e9bad1d75b61c
parent010a00db604d4dad16f5f5d9860ce7ff78b21b2c
Merge branch 'MDL-54545-master' of git://github.com/junpataleta/moodle