Merge branch 'MDL-54868-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 08:19:48 +0000 (09:19 +0100)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:26 +0000 (15:05 +0800)
commit77369c8171d634158c01666d3ff0a924e0c3dbaa
tree330e876eeebbf33e80207d34900de209082aced4
parentce63e9b2d71651cc6b7bfa7553a89ba91bf6de1f
parent94ada0eaf77e9ef70568e1fb890ba86b1f006862
Merge branch 'MDL-54868-master' of git://github.com/cameron1729/moodle