Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 22:43:59 +0000 (11:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 22:43:59 +0000 (11:43 +1300)
commiteaf750cd9a123b876a2afac38bd84c05f29cf644
tree828107ea7b6133990e7e264ea92904d82d229f94
parentbef123d608193293d9cd8258227a6a132a028378
parentd01176bfc973e3b8ff7724509cbade5151cf703e
Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle