Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 07:36:15 +0000 (15:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 07:36:15 +0000 (15:36 +0800)
commitaf08eb991292e55db607fc2fed7b7fb1abb41c2a
tree56f03b79ab5989be47b3f732de755b8d8dec5077
parent877bb8294c7c7bbf5553f242913ac12d2122bc5a
parent5c92e7a740fbce4184cf204a11ebbb6b918a376b
Merge branch 'MDL-39474-master' of git://github.com/sammarshallou/moodle
cache/classes/helper.php
lib/moodlelib.php