Merge branch 'MDL-34939-master' of https://github.com/lucisgit/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 24 Apr 2013 07:01:35 +0000 (15:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 24 Apr 2013 07:01:35 +0000 (15:01 +0800)
commit7d45396306a582a25b8bfcff7f5c6a3c8f801a83
treed430e4db4c168aece920d361afde4eebdd403eb0
parenta6e22a88c7d0a75b0475a834d71d5d062234fd88
parentef7dd02cc7df9d003d7d226cbc0aee44d6bcc9b5
Merge branch 'MDL-34939-master' of https://github.com/lucisgit/moodle
repository/lib.php