Merge branch 'MDL-36695-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 04:21:03 +0000 (12:21 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 04:21:03 +0000 (12:21 +0800)
commit694b2e20bbb293c1e677d10dc73402ca46fa5726
tree210fd6db1c4c3565aff5e26438afc0b6e068d977
parentad47d025952223207054a9a4b754bc70c44bd6c8
parenta37bf4b1dd5dd0148a3007635c9d71d0a503a2ec
Merge branch 'MDL-36695-master' of git://github.com/FMCorz/moodle