Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 02:50:48 +0000 (15:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 02:50:48 +0000 (15:50 +1300)
commitaa01949f24d2cdea8785dd026a93d17294469401
tree2aaed17d6d90df1c61614897c4b4678c48f13439
parentab20c84affd2e06b86d3290da8c9ddf1c871fa92
parent8e328617863ce713f4acf8f07e60ed16ceb82d4b
Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle