Merge branch 'MDL-32745-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 02:18:06 +0000 (10:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 02:18:06 +0000 (10:18 +0800)
commitb766edea0a05677999528988b05f29eaac27b0b4
tree224b2602cf50e88e1afcc5c5019c09a16fb4de4c
parentcc8cc1df8051af4d589089f4e9a60c5fb2143c8d
parent178f3514804246042286f25fd97d0229b5c1d579
Merge branch 'MDL-32745-master-1' of git://git.luns.net.uk/moodle