Merge branch 'MDL-52835-master' of git://github.com/deraadt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 14:14:45 +0000 (14:14 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:19 +0000 (10:15 +0800)
commit4ce63c9ccfe4f714aa0b8a8409671a8003f7e476
tree192881406d7889d9c711f2934e0ae6fa8d033b98
parente23c76d72e098e62cd4309e8e4ca6ec11f83aa52
parentacc9fed2ee161245bd49ef6c2574c5cb5ce5be87
Merge branch 'MDL-52835-master' of git://github.com/deraadt/moodle