Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Dec 2014 07:50:00 +0000 (07:50 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:10 +0000 (12:04 +0000)
commit2852a9a0aa3cd3ab9f98a22d98a8b86c967a223b
tree5dca031a586bee7202d2c2c6d237fb40500dd444
parent951af91e083b3049ba13f8fceda7c5685251afd8
parentf8857122004869a8289b1f1992bc2cddead22af4
Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle