Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 12:48:09 +0000 (12:48 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 12:48:09 +0000 (12:48 +0000)
commitc4d9fd1afef016544f689a0ee807817e8560ee0e
treea7bf1d8d30561bdbe0b49d9c60948539cb7fd0db
parentdee51f01d6a7298d124275b8ed3ee830982915ab
parent7829997343d7a549421273cab5e5da85a217d69b
Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle