Merge branch 'MDL-49595' of https://github.com/rlorenzo/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:51:43 +0000 (14:51 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 13:51:43 +0000 (14:51 +0100)
commita9feb0c48f8fbcfd30665d98a799c7765652c78d
tree9bd530e20e6d1a47e8d92b59338828a9e8a088bf
parentc157a42a7b51ac7c710f9646b5eee2f413090ee8
parent7519d366ef441b4dad415ce13ea9a3a11a0e161e
Merge branch 'MDL-49595' of https://github.com/rlorenzo/moodle