Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 22:07:40 +0000 (11:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 22:07:40 +0000 (11:07 +1300)
commit3ad0ab4e67dd4204b221d0fa924b820553952992
treecf563af4d199c921e1c0f031bd50629512935dcb
parent24430c5aadc6f61a9e1a67699885a8fece4f60d6
parentab4cb125e49d05956383360002f934ec44904009
Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Conflicts:
version.php
course/index.php
course/lib.php
version.php