Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 02:42:31 +0000 (10:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 02:42:31 +0000 (10:42 +0800)
commit2254fb27643c4474dc38da4ea6232e0074ee1b05
treec3b85f9734430467eeb82e6b112274ae85668839
parentca2dfd0070aab59e757b50dad61fa2cc0a9a4399
parentc2bc5a70087a21a4c05cd2a13afdf884e61464c6
Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle