Merge branch 'dev_MDL-33177_restore_warning' of git://github.com/dongsheng/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 09:14:43 +0000 (17:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 09:14:43 +0000 (17:14 +0800)
commit198244e2d9ab65ab81cefcaf9690280b4c8e9580
treeab56471b11e1a37666fc0cd1599d15570738ea2a
parent37eba7d5d69123b1908fcc6e829219171ac30ef9
parentac0628e913078f10cb812e5c153114f23905e1e0
Merge branch 'dev_MDL-33177_restore_warning' of git://github.com/dongsheng/moodle