Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 21:56:39 +0000 (10:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 21:56:39 +0000 (10:56 +1300)
commit70601b94336039c5bab172c64efab18ae590ef6a
treed65fe3f2acf945259b4893dd804171ca98dbc073
parent17e5c6e8d2abf6da3fbcd7a23f8ae4fe063d2460
parentc4844bf45cf04f8c5ecb99818d51aac74be69027
Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle