Merge branch 'wip-MDL-17929-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 28 Apr 2015 03:42:10 +0000 (11:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Apr 2015 09:11:18 +0000 (10:11 +0100)
commit1d47b81928a12a95e6a241392dc29896286ae3e5
tree24b174ec3cec11793dee2fd9a105709e6a3c7f57
parent1f619e8d60aebd240cdc798c80d45e15e4861f77
parentf99fe1104587ab1d3ec6459b21fdbf18c3c90bfa
Merge branch 'wip-MDL-17929-master' of git://github.com/marinaglancy/moodle