Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 09:16:44 +0000 (17:16 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 09:16:44 +0000 (17:16 +0800)
commit36594faebb3726bf8bfbddd0373d8f750252efdb
tree0a689b74634b6d29c1f189a9f356974c5b3d93dc
parentaeeccb1697795e25fdd61941a0e16dd3b7194a6d
parent555837c5d4a844436826eb24af06d8dc07877e6c
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle