Merge branch 'wip-MDL-31810-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:01:20 +0000 (12:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:01:20 +0000 (12:01 +0800)
commit388309ca361202f0c6f3f7777c8091dec7903a5b
tree1cbed0e79313ea011f3cb0437d978bf2038505d0
parentf64684516420e422304b7a61a45e4e6e0333dfad
parentb2e7db07fc7a8a76de54c05c1afdc09c3191949b
Merge branch 'wip-MDL-31810-master' of git://github.com/phalacee/moodle