Merge branch 'MDL-51683-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 08:48:47 +0000 (09:48 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:03 +0000 (09:04 +0100)
commitd13f2a693406d6611d4cbfb014da4688fea7dc14
treee9ff0c0f372baf58a527a95a19c2fe9c9f519ce3
parentd25e8fde45eb14649d3178a7acd16be3dd184b94
parent000d660fda38c47bb897414d72d531215147ef0e
Merge branch 'MDL-51683-master' of git://github.com/FMCorz/moodle