Merge branch 'wip-MDL-31953-master' of git://github.com/phalacee/moodle
commitb370716f7bf885211237e68e1947343edb16ca4d
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:48:35 +0000 (9 11:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:48:35 +0000 (9 11:48 +1200)
tree3ee69cae5c725f6173e08ee3b3b34ae5cb42c9ac
parent09d64cadee44faf143b5871bb91d158f63054ec5
parentc72c01b184010732cfc4af777dccca798ea03934
Merge branch 'wip-MDL-31953-master' of git://github.com/phalacee/moodle