Merge branch 'wip-MDL-36937-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 30 Nov 2012 01:48:36 +0000 (09:48 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 30 Nov 2012 01:48:36 +0000 (09:48 +0800)
commit6b003f12eb5f64936a6033eb01afa3f5f47369ae
treef7c945cee3bdf1231b4885fbfdbf66f396489b49
parentb584a358454d328ea48c81f208b2157914db64b3
parentb870426ab63f0ecd1f7c47496e7e90aef8c3e47a
Merge branch 'wip-MDL-36937-m24' of git://github.com/samhemelryk/moodle