Merge branch 'MDL-47712-master' of git://github.com/dthies/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:33:14 +0000 (10:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:33:14 +0000 (10:33 +0800)
commitda7f38007ef70706ddf6b712dc119b505ce8e8ae
tree0a90ef3118e8a89e850210a09ece337e1ae0309c
parent5f2747c86646b0a5a48c0acea162129c46a5ff19
parent530a2cb0d13699644be81f2c0820e0a861918fd9
Merge branch 'MDL-47712-master' of git://github.com/dthies/moodle