Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle
commit84842f54dda9ba635db816b915b567a6cb662fa8
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 05:54:45 +0000 (9 15:54 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 05:54:45 +0000 (9 15:54 +1000)
tree34c4a326104d9ced76a4bcce0c94a1b705376299
parent8a011a9f0a472a5c0e6c7060104db698ba49e84e
parent3b62cd64d7efff03ba707f0a3d662b377afdf0f8
Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle