Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:14:07 +0000 (11:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:14:07 +0000 (11:14 +0100)
commitb15e5d725258a11e9ba466ba6c903b5e8d853048
treefc6845780c966f8bedd1950377dcb37f2521687d
parent6b16846e831cbfd0b8fe2ece9af8188ca741aca7
parent6f003159a2ff8ec661e7bd0bc56d31c4aa77f411
Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE