Merge branch 'MDL-33731-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 04:10:34 +0000 (12:10 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 04:10:34 +0000 (12:10 +0800)
commitd25887d440201d567cf16437b30329664d0f1ad0
treee1cbf4ab4addc8caa37bb30ed5f69e0bd9928c7a
parentb44022782b7254bf89fea67382a8e2bb579d23b4
parent346099f08b32c1e3aef49f7ab104cdeccc70d0f5
Merge branch 'MDL-33731-master-1' of git://git.luns.net.uk/moodle